Fix some coding-style errors in autofs

Fix coding style errors (extra spaces, long lines) in autofs and autofs4 files
being modified for container/pidspace issues.

Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: <containers@lists.osdl.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 16 insertions, 18 deletions

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 5769a2f9ad60..692364e8ffc3 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -218,8 +218,7 @@ static match_table_t tokens = {
 };
 
 static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
-                         pid_t *pgrp, unsigned int *type,
-                         int *minproto, int *maxproto)
+                pid_t *pgrp, unsigned int *type, int *minproto, int *maxproto)
 {
         char *p;
         substring_t args[MAX_OPT_ARGS];
@@ -314,7 +313,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
         struct autofs_info *ino;
 
         sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
-        if ( !sbi )
+        if (!sbi)
                 goto fail_unlock;
         DPRINTK("starting up, sbi = %p",sbi);
 
@@ -363,10 +362,9 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
         root->d_fsdata = ino;
 
         /* Can this call block? */
-        if (parse_options(data, &pipefd,
-                          &root_inode->i_uid, &root_inode->i_gid,
-                          &sbi->oz_pgrp, &sbi->type,
-                          &sbi->min_proto, &sbi->max_proto)) {
+        if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid,
+                                &sbi->oz_pgrp, &sbi->type, &sbi->min_proto,
+                                &sbi->max_proto)) {
                 printk("autofs: called with bogus options\n");
                 goto fail_dput;
         }
@@ -396,11 +394,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
         DPRINTK("pipe fd = %d, pgrp = %u", pipefd, sbi->oz_pgrp);
         pipe = fget(pipefd);
         
-        if ( !pipe ) {
+        if (!pipe) {
                 printk("autofs: could not open pipe file descriptor\n");
                 goto fail_dput;
         }
-        if ( !pipe->f_op || !pipe->f_op->write )
+        if (!pipe->f_op || !pipe->f_op->write)
                 goto fail_fput;
         sbi->pipe = pipe;
         sbi->pipefd = pipefd;
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 15170f4e13a7..2d4c8a3e604e 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -759,7 +759,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
         struct autofs_info *p_ino;
         
         /* This allows root to remove symlinks */
-        if ( !autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN) )
+        if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
         if (atomic_dec_and_test(&ino->count)) {
@@ -833,7 +833,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         struct autofs_info *p_ino;
         struct inode *inode;
 
-        if ( !autofs4_oz_mode(sbi) )
+        if (!autofs4_oz_mode(sbi))
                 return -EACCES;
 
         DPRINTK("dentry %p, creating %.*s",
@@ -871,11 +871,11 @@ static inline int autofs4_get_set_timeout(struct autofs_sb_info *sbi,
         int rv;
         unsigned long ntimeout;
 
-        if ( (rv = get_user(ntimeout, p)) ||
-             (rv = put_user(sbi->exp_timeout/HZ, p)) )
+        if ((rv = get_user(ntimeout, p)) ||
+             (rv = put_user(sbi->exp_timeout/HZ, p)))
                 return rv;
 
-        if ( ntimeout > ULONG_MAX/HZ )
+        if (ntimeout > ULONG_MAX/HZ)
                 sbi->exp_timeout = 0;
         else
                 sbi->exp_timeout = ntimeout * HZ;
@@ -906,7 +906,7 @@ static inline int autofs4_ask_reghost(struct autofs_sb_info *sbi, int __user *p)
         DPRINTK("returning %d", sbi->needs_reghost);
 
         status = put_user(sbi->needs_reghost, p);
-        if ( status )
+        if (status)
                 return status;
 
         sbi->needs_reghost = 0;
@@ -975,11 +975,11 @@ static int autofs4_root_ioctl(struct inode *inode, struct file *filp,
         DPRINTK("cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u",
                 cmd,arg,sbi,process_group(current));
 
-        if ( _IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
-             _IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT )
+        if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
+             _IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT)
                 return -ENOTTY;
         
-        if ( !autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN) )
+        if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
                 return -EPERM;
         
         switch(cmd) {