VFS: apply coding standards to fs/ioctl.c

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ioctl.c b/fs/ioctl.c
index c2a773e8620bdd307db7ce16d074f5b4ada2b5b1..652cacf433ffd040397d1e1fb8580c11e1447fae 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -12,8 +12,8 @@
 #include <linux/fs.h>
 #include <linux/security.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
 
-#include <asm/uaccess.h>
 #include <asm/ioctls.h>
 
 static long do_ioctl(struct file *filp, unsigned int cmd,
@@ -45,31 +45,31 @@ static int file_ioctl(struct file *filp, unsigned int cmd,
 {
        int error;
        int block;
-       struct inode * inode = filp->f_path.dentry->d_inode;
+       struct inode *inode = filp->f_path.dentry->d_inode;
        int __user *p = (int __user *)arg;
 
        switch (cmd) {
-               case FIBMAP:
-               {
-                       struct address_space *mapping = filp->f_mapping;
-                       int res;
-                       /* do we support this mess? */
-                       if (!mapping->a_ops->bmap)
-                               return -EINVAL;
-                       if (!capable(CAP_SYS_RAWIO))
-                               return -EPERM;
-                       if ((error = get_user(block, p)) != 0)
-                               return error;
-
-                       lock_kernel();
-                       res = mapping->a_ops->bmap(mapping, block);
-                       unlock_kernel();
-                       return put_user(res, p);
-               }
-               case FIGETBSZ:
-                       return put_user(inode->i_sb->s_blocksize, p);
-               case FIONREAD:
-                       return put_user(i_size_read(inode) - filp->f_pos, p);
+       case FIBMAP:
+       {
+               struct address_space *mapping = filp->f_mapping;
+               int res;
+               /* do we support this mess? */
+               if (!mapping->a_ops->bmap)
+                       return -EINVAL;
+               if (!capable(CAP_SYS_RAWIO))
+                       return -EPERM;
+               error = get_user(block, p);
+               if (error)
+                       return error;
+               lock_kernel();
+               res = mapping->a_ops->bmap(mapping, block);
+               unlock_kernel();
+               return put_user(res, p);
+       }
+       case FIGETBSZ:
+               return put_user(inode->i_sb->s_blocksize, p);
+       case FIONREAD:
+               return put_user(i_size_read(inode) - filp->f_pos, p);
        }
 
        return do_ioctl(filp, cmd, arg);
@@ -82,81 +82,85 @@ static int file_ioctl(struct file *filp, unsigned int cmd,
  * vfs_ioctl() is not for drivers and not intended to be EXPORT_SYMBOL()'d.
  * It's just a simple helper for sys_ioctl and compat_sys_ioctl.
  */
-int vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, unsigned long arg)
+int vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
+             unsigned long arg)
 {
        unsigned int flag;
        int on, error = 0;
 
        switch (cmd) {
-               case FIOCLEX:
-                       set_close_on_exec(fd, 1);
-                       break;
+       case FIOCLEX:
+               set_close_on_exec(fd, 1);
+               break;
 
-               case FIONCLEX:
-                       set_close_on_exec(fd, 0);
-                       break;
+       case FIONCLEX:
+               set_close_on_exec(fd, 0);
+               break;
 
-               case FIONBIO:
-                       if ((error = get_user(on, (int __user *)arg)) != 0)
-                               break;
-                       flag = O_NONBLOCK;
+       case FIONBIO:
+               error = get_user(on, (int __user *)arg);
+               if (error)
+                       break;
+               flag = O_NONBLOCK;
 #ifdef __sparc__
-                       /* SunOS compatibility item. */
-                       if(O_NONBLOCK != O_NDELAY)
-                               flag |= O_NDELAY;
+               /* SunOS compatibility item. */
+               if (O_NONBLOCK != O_NDELAY)
+                       flag |= O_NDELAY;
 #endif
-                       if (on)
-                               filp->f_flags |= flag;
-                       else
-                               filp->f_flags &= ~flag;
+               if (on)
+                       filp->f_flags |= flag;
+               else
+                       filp->f_flags &= ~flag;
+               break;
+
+       case FIOASYNC:
+               error = get_user(on, (int __user *)arg);
+               if (error)
                        break;
-
-               case FIOASYNC:
-                       if ((error = get_user(on, (int __user *)arg)) != 0)
-                               break;
-                       flag = on ? FASYNC : 0;
-
-                       /* Did FASYNC state change ? */
-                       if ((flag ^ filp->f_flags) & FASYNC) {
-                               if (filp->f_op && filp->f_op->fasync) {
-                                       lock_kernel();
-                                       error = filp->f_op->fasync(fd, filp, on);
-                                       unlock_kernel();
-                               }
-                               else error = -ENOTTY;
-                       }
-                       if (error != 0)
-                               break;
-
-                       if (on)
-                               filp->f_flags |= FASYNC;
-                       else
-                               filp->f_flags &= ~FASYNC;
-                       break;
-
-               case FIOQSIZE:
-                       if (S_ISDIR(filp->f_path.dentry->d_inode->i_mode) ||
-                           S_ISREG(filp->f_path.dentry->d_inode->i_mode) ||
-                           S_ISLNK(filp->f_path.dentry->d_inode->i_mode)) {
-                               loff_t res = inode_get_bytes(filp->f_path.dentry->d_inode);
-                               error = copy_to_user((loff_t __user *)arg, &res, sizeof(res)) ? -EFAULT : 0;
-                       }
-                       else
+               flag = on ? FASYNC : 0;
+
+               /* Did FASYNC state change ? */
+               if ((flag ^ filp->f_flags) & FASYNC) {
+                       if (filp->f_op && filp->f_op->fasync) {
+                               lock_kernel();
+                               error = filp->f_op->fasync(fd, filp, on);
+                               unlock_kernel();
+                       } else
                                error = -ENOTTY;
+               }
+               if (error != 0)
                        break;
-               default:
-                       if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))
-                               error = file_ioctl(filp, cmd, arg);
-                       else
-                               error = do_ioctl(filp, cmd, arg);
-                       break;
+
+               if (on)
+                       filp->f_flags |= FASYNC;
+               else
+                       filp->f_flags &= ~FASYNC;
+               break;
+
+       case FIOQSIZE:
+               if (S_ISDIR(filp->f_path.dentry->d_inode->i_mode) ||
+                   S_ISREG(filp->f_path.dentry->d_inode->i_mode) ||
+                   S_ISLNK(filp->f_path.dentry->d_inode->i_mode)) {
+                       loff_t res =
+                               inode_get_bytes(filp->f_path.dentry->d_inode);
+                       error = copy_to_user((loff_t __user *)arg, &res,
+                                            sizeof(res)) ? -EFAULT : 0;
+               } else
+                       error = -ENOTTY;
+               break;
+       default:
+               if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))
+                       error = file_ioctl(filp, cmd, arg);
+               else
+                       error = do_ioctl(filp, cmd, arg);
+               break;
        }
        return error;
 }
 
 asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
 {
-       struct file * filp;
+       struct file *filp;
        int error = -EBADF;
        int fput_needed;