1 files changed, 22 insertions, 19 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index e068e744dbdd..99ec5b40e977 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -46,7 +46,7 @@ static unsigned int sysfs_name_hash(const void *ns, const char *name)
         unsigned int len = strlen(name);
         while (len--)
                 hash = partial_name_hash(*name++, hash);
-        hash = ( end_name_hash(hash) ^ hash_ptr( (void *)ns, 31 ) );
+        hash = (end_name_hash(hash) ^ hash_ptr((void *)ns, 31));
         hash &= 0x7fffffffU;
         /* Reserve hash numbers 0, 1 and INT_MAX for magic directory entries */
         if (hash < 1)
@@ -258,7 +258,7 @@ static void sysfs_free_ino(unsigned int ino)
         spin_unlock(&sysfs_ino_lock);
 }
 
-void release_sysfs_dirent(struct sysfs_dirent * sd)
+void release_sysfs_dirent(struct sysfs_dirent *sd)
 {
         struct sysfs_dirent *parent_sd;
 
@@ -451,7 +451,7 @@ int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
 
         if (!!sysfs_ns_type(acxt->parent_sd) != !!sd->s_ns) {
                 WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n",
-                        sysfs_ns_type(acxt->parent_sd)? "required": "invalid",
+                        sysfs_ns_type(acxt->parent_sd) ? "required" : "invalid",
                         acxt->parent_sd->s_name, sd->s_name);
                 return -EINVAL;
         }
@@ -619,7 +619,7 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
 
         if (!!sysfs_ns_type(parent_sd) != !!ns) {
                 WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n",
-                        sysfs_ns_type(parent_sd)? "required": "invalid",
+                        sysfs_ns_type(parent_sd) ? "required" : "invalid",
                         parent_sd->s_name, name);
                 return NULL;
         }
@@ -674,7 +674,7 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
         enum kobj_ns_type type, const void *ns, const char *name,
         struct sysfs_dirent **p_sd)
 {
-        umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO;
+        umode_t mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
         struct sysfs_addrm_cxt acxt;
         struct sysfs_dirent *sd;
         int rc;
@@ -735,9 +735,9 @@ static enum kobj_ns_type sysfs_read_ns_type(struct kobject *kobj)
 
 /**
  *      sysfs_create_dir - create a directory for an object.
- *      @kobj:          object we're creating directory for. 
+ *      @kobj:          object we're creating directory for.
  */
-int sysfs_create_dir(struct kobject * kobj)
+int sysfs_create_dir(struct kobject *kobj)
 {
         enum kobj_ns_type type;
         struct sysfs_dirent *parent_sd, *sd;
@@ -764,8 +764,8 @@ int sysfs_create_dir(struct kobject * kobj)
         return error;
 }
 
-static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
-                                unsigned int flags)
+static struct dentry *sysfs_lookup(struct inode *dir, struct dentry *dentry,
+                                   unsigned int flags)
 {
         struct dentry *ret = NULL;
         struct dentry *parent = dentry->d_parent;
@@ -857,7 +857,7 @@ static void __sysfs_remove_dir(struct sysfs_dirent *dir_sd)
  *      what used to be sysfs_rmdir() below, instead of calling separately.
  */
 
-void sysfs_remove_dir(struct kobject * kobj)
+void sysfs_remove_dir(struct kobject *kobj)
 {
         struct sysfs_dirent *sd = kobj->sd;
 
@@ -896,7 +896,9 @@ int sysfs_rename(struct sysfs_dirent *sd,
                 sd->s_name = new_name;
         }
 
-        /* Move to the appropriate place in the appropriate directories rbtree. */
+        /*
+         * Move to the appropriate place in the appropriate directories rbtree.
+         */
         sysfs_unlink_sibling(sd);
         sysfs_get(new_parent_sd);
         sysfs_put(sd->s_parent);
@@ -988,20 +990,21 @@ static struct sysfs_dirent *sysfs_dir_next_pos(const void *ns,
         struct sysfs_dirent *parent_sd, ino_t ino, struct sysfs_dirent *pos)
 {
         pos = sysfs_dir_pos(ns, parent_sd, ino, pos);
-        if (pos) do {
-                struct rb_node *node = rb_next(&pos->s_rb);
-                if (!node)
-                        pos = NULL;
-                else
-                        pos = to_sysfs_dirent(node);
-        } while (pos && pos->s_ns != ns);
+        if (pos)
+                do {
+                        struct rb_node *node = rb_next(&pos->s_rb);
+                        if (!node)
+                                pos = NULL;
+                        else
+                                pos = to_sysfs_dirent(node);
+                } while (pos && pos->s_ns != ns);
         return pos;
 }
 
 static int sysfs_readdir(struct file *file, struct dir_context *ctx)
 {
         struct dentry *dentry = file->f_path.dentry;
-        struct sysfs_dirent * parent_sd = dentry->d_fsdata;
+        struct sysfs_dirent *parent_sd = dentry->d_fsdata;
         struct sysfs_dirent *pos = file->private_data;
         enum kobj_ns_type type;
         const void *ns;