2.6.25-rc7

 fs

diff --git a/fs/ioctl.c b/fs/ioctl.c
index c2a773e..f32fbde 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -12,12 +12,24 @@
 #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,
-      unsigned long arg)
+/**
+ * vfs_ioctl - call filesystem specific ioctl methods
+ * @filp:   open file to invoke ioctl method on
+ * @cmd:   ioctl command to execute
+ * @arg:   command-specific argument for ioctl
+ *
+ * Invokes filesystem specific ->unlocked_ioctl, if one exists; otherwise
+ * invokes filesystem specific ->ioctl method.  If neither method exists,
+ * returns -ENOTTY.
+ *
+ * Returns 0 on success, -errno on error.
+ */
+long vfs_ioctl(struct file *filp, unsigned int cmd,
+          unsigned long arg)
 {
    int error = -ENOTTY;
 
@@ -40,123 +52,148 @@ static long do_ioctl(struct file *filp, unsigned int cmd,
    return error;
 }
 
+static int ioctl_fibmap(struct file *filp, int __user *p)
+{
+   struct address_space *mapping = filp->f_mapping;
+   int res, block;
+
+   /* do we support this mess? */
+   if (!mapping->a_ops->bmap)
+      return -EINVAL;
+   if (!capable(CAP_SYS_RAWIO))
+      return -EPERM;
+   res = get_user(block, p);
+   if (res)
+      return res;
+   lock_kernel();
+   res = mapping->a_ops->bmap(mapping, block);
+   unlock_kernel();
+   return put_user(res, p);
+}
+
 static int file_ioctl(struct file *filp, unsigned int cmd,
       unsigned long arg)
 {
-   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;
+   case FIBMAP:
+      return ioctl_fibmap(filp, 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 vfs_ioctl(filp, cmd, arg);
+}
+
+static int ioctl_fionbio(struct file *filp, int __user *argp)
+{
+   unsigned int flag;
+   int on, error;
+
+   error = get_user(on, argp);
+   if (error)
+      return error;
+   flag = O_NONBLOCK;
+#ifdef __sparc__
+   /* SunOS compatibility item. */
+   if (O_NONBLOCK != O_NDELAY)
+      flag |= O_NDELAY;
+#endif
+   if (on)
+      filp->f_flags |= flag;
+   else
+      filp->f_flags &= ~flag;
+   return error;
+}
+
+static int ioctl_fioasync(unsigned int fd, struct file *filp,
+           int __user *argp)
+{
+   unsigned int flag;
+   int on, error;
+
+   error = get_user(on, argp);
+   if (error)
+      return error;
+   flag = on ? FASYNC : 0;
+
+   /* Did FASYNC state change ? */
+   if ((flag ^ filp->f_flags) & FASYNC) {
+      if (filp->f_op && filp->f_op->fasync) {
          lock_kernel();
-         res = mapping->a_ops->bmap(mapping, block);
+         error = filp->f_op->fasync(fd, filp, on);
          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);
+      } else
+         error = -ENOTTY;
    }
+   if (error)
+      return error;
 
-   return do_ioctl(filp, cmd, arg);
+   if (on)
+      filp->f_flags |= FASYNC;
+   else
+      filp->f_flags &= ~FASYNC;
+   return error;
 }
 
 /*
  * When you add any new common ioctls to the switches above and below
  * please update compat_sys_ioctl() too.
  *
- * vfs_ioctl() is not for drivers and not intended to be EXPORT_SYMBOL()'d.
+ * do_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 do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
+        unsigned long arg)
 {
-   unsigned int flag;
-   int on, error = 0;
+   int error = 0;
+   int __user *argp = (int __user *)arg;
 
    switch (cmd) {
-      case FIOCLEX:
-         set_close_on_exec(fd, 1);
-         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;
-#ifdef __sparc__
-         /* SunOS compatibility item. */
-         if(O_NONBLOCK != O_NDELAY)
-            flag |= O_NDELAY;
-#endif
-         if (on)
-            filp->f_flags |= flag;
-         else
-            filp->f_flags &= ~flag;
-         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
-            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;
+   case FIOCLEX:
+      set_close_on_exec(fd, 1);
+      break;
+
+   case FIONCLEX:
+      set_close_on_exec(fd, 0);
+      break;
+
+   case FIONBIO:
+      error = ioctl_fionbio(filp, argp);
+      break;
+
+   case FIOASYNC:
+      error = ioctl_fioasync(fd, filp, argp);
+      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 = vfs_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;
 
@@ -168,7 +205,7 @@ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
    if (error)
       goto out_fput;
 
-   error = vfs_ioctl(filp, fd, cmd, arg);
+   error = do_vfs_ioctl(filp, fd, cmd, arg);
  out_fput:
    fput_light(filp, fput_needed);
  out: