From 2d905cc66347675ac739e1843399cc4dba7c5c01 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Jan 2014 14:00:06 -0800 Subject: [PATCH] various 80 column warnings fixed up Signed-off-by: Greg Kroah-Hartman --- handle.c | 3 ++- memfd.c | 3 ++- metadata.c | 9 ++++++--- names.c | 3 ++- namespace.c | 9 ++++++--- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/handle.c b/handle.c index e2e6c10..a33a1c4 100644 --- a/handle.c +++ b/handle.c @@ -391,7 +391,8 @@ static long kdbus_handle_ioctl_ep(struct file *file, unsigned int cmd, break; } - ret = kdbus_conn_new(handle->ep, hello, handle->meta, &handle->conn); + ret = kdbus_conn_new(handle->ep, hello, handle->meta, + &handle->conn); if (ret < 0) break; diff --git a/memfd.c b/memfd.c index aa87faf..2c08891 100644 --- a/memfd.c +++ b/memfd.c @@ -125,7 +125,8 @@ int kdbus_memfd_new(int *fd) * invisible shmem inode. We rely on the fact that nothing else * can create a new file for the shmem inode, like by opening the * fd in /proc/$PID/fd/ */ - fp = anon_inode_getfile("[" KBUILD_MODNAME "]", &kdbus_memfd_fops, mf, O_RDWR); + fp = anon_inode_getfile("[" KBUILD_MODNAME "]", + &kdbus_memfd_fops, mf, O_RDWR); if (IS_ERR(fp)) { ret = PTR_ERR(fp); goto exit_fd; diff --git a/metadata.c b/metadata.c index 7c19921..364d9cd 100644 --- a/metadata.c +++ b/metadata.c @@ -209,7 +209,8 @@ static int kdbus_meta_append_src_names(struct kdbus_meta *meta, } item->type = KDBUS_ITEM_NAME; - item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_name) + len; + item->size = KDBUS_ITEM_HEADER_SIZE + + sizeof(struct kdbus_name) + len; item->name.flags = e->flags; memcpy(item->name.name, e->name, len); } @@ -274,7 +275,8 @@ static int kdbus_meta_append_cmdline(struct kdbus_meta *meta) if (len > PAGE_SIZE) len = PAGE_SIZE; - ret = copy_from_user(tmp, (const char __user *) mm->arg_start, len); + ret = copy_from_user(tmp, (const char __user *)mm->arg_start, + len); if (ret == 0) ret = kdbus_meta_append_data(meta, KDBUS_ITEM_CMDLINE, tmp, len); @@ -367,7 +369,8 @@ static int kdbus_meta_append_seclabel(struct kdbus_meta *meta) return ret; if (label && len > 0) - ret = kdbus_meta_append_data(meta, KDBUS_ITEM_SECLABEL, label, len); + ret = kdbus_meta_append_data(meta, KDBUS_ITEM_SECLABEL, + label, len); security_release_secctx(label, len); return ret; diff --git a/names.c b/names.c index a5f93e0..af6c225 100644 --- a/names.c +++ b/names.c @@ -433,7 +433,8 @@ int kdbus_name_acquire(struct kdbus_name_registry *reg, * from a connection which asked for queuing. */ if (e->flags & KDBUS_NAME_QUEUE) { - ret = kdbus_name_queue_conn(e->conn, e->flags, e); + ret = kdbus_name_queue_conn(e->conn, + e->flags, e); if (ret < 0) goto exit_unlock; } diff --git a/namespace.c b/namespace.c index ea3b6aa..a9aa379 100644 --- a/namespace.c +++ b/namespace.c @@ -145,7 +145,8 @@ struct kdbus_ns *kdbus_ns_unref(struct kdbus_ns *ns) return NULL; } -static struct kdbus_ns *kdbus_ns_find(struct kdbus_ns const *parent, const char *name) +static struct kdbus_ns *kdbus_ns_find(struct kdbus_ns const *parent, + const char *name) { struct kdbus_ns *ns = NULL; struct kdbus_ns *n; @@ -193,7 +194,8 @@ struct kdbus_ns *kdbus_ns_find_by_major(unsigned int major) * * Returns: 0 on success, negative errno on failure. */ -int kdbus_ns_new(struct kdbus_ns *parent, const char *name, umode_t mode, struct kdbus_ns **ns) +int kdbus_ns_new(struct kdbus_ns *parent, const char *name, umode_t mode, + struct kdbus_ns **ns) { struct kdbus_ns *n; int ret; @@ -234,7 +236,8 @@ int kdbus_ns_new(struct kdbus_ns *parent, const char *name, umode_t mode, struct goto exit_unlock; } - n->devpath = kasprintf(GFP_KERNEL, "%s/ns/%s", parent->devpath, name); + n->devpath = kasprintf(GFP_KERNEL, "%s/ns/%s", + parent->devpath, name); if (!n->devpath) { ret = -ENOMEM; goto exit_unlock; -- 2.34.1