convert_ext3_to_use_unlocked_ioctl_v2

   1 Convert ext3 to use unlocked_ioctl v2
   2
   3 From: Andi Kleen <ak@suse.de>
   4
   5 I checked ext3_ioctl and it looked largely safe to not be used
   6 without BKL.  So convert it over to unlocked_ioctl.
   7
   8 Signed-off-by: Andi Kleen <ak@suse.de>
   9
  10 v1->v2: drop lock kernel for online growth. resize.c seems to do enough
  11 locking
  12 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  13
  14 diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
  15 index 8ca3bfd..77a6962 100644
  16 --- a/fs/ext3/dir.c
  17 +++ b/fs/ext3/dir.c
  18 @@ -42,7 +42,7 @@ const struct file_operations ext3_dir_operations = {
  19         .llseek         = generic_file_llseek,
  20         .read           = generic_read_dir,
  21         .readdir        = ext3_readdir,         /* we take BKL. needed?*/
  22 -       .ioctl          = ext3_ioctl,           /* BKL held */
  23 +       .unlocked_ioctl = ext3_ioctl,
  24  #ifdef CONFIG_COMPAT
  25         .compat_ioctl   = ext3_compat_ioctl,
  26  #endif
  27 diff --git a/fs/ext3/file.c b/fs/ext3/file.c
  28 index acc4913..2da795e 100644
  29 --- a/fs/ext3/file.c
  30 +++ b/fs/ext3/file.c
  31 @@ -112,7 +112,7 @@ const struct file_operations ext3_file_operations = {
  32         .write          = do_sync_write,
  33         .aio_read       = generic_file_aio_read,
  34         .aio_write      = ext3_file_write,
  35 -       .ioctl          = ext3_ioctl,
  36 +       .unlocked_ioctl = ext3_ioctl,
  37  #ifdef CONFIG_COMPAT
  38         .compat_ioctl   = ext3_compat_ioctl,
  39  #endif
  40 diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
  41 index 023a070..0f177d2 100644
  42 --- a/fs/ext3/ioctl.c
  43 +++ b/fs/ext3/ioctl.c
  44 @@ -17,9 +17,9 @@
  45  #include <linux/smp_lock.h>
  46  #include <asm/uaccess.h>
  47
  48 -int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
  49 -               unsigned long arg)
  50 +long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  51  {
  52 +       struct inode *inode = filp->f_dentry->d_inode;
  53         struct ext3_inode_info *ei = EXT3_I(inode);
  54         unsigned int flags;
  55         unsigned short rsv_window_size;
  56 @@ -263,9 +263,6 @@ flags_err:
  57  #ifdef CONFIG_COMPAT
  58  long ext3_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  59  {
  60 -       struct inode *inode = file->f_path.dentry->d_inode;
  61 -       int ret;
  62 -
  63         /* These are just misnamed, they actually get/put from/to user an int */
  64         switch (cmd) {
  65         case EXT3_IOC32_GETFLAGS:
  66 @@ -305,9 +302,6 @@ long ext3_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  67         default:
  68                 return -ENOIOCTLCMD;
  69         }
  70 -       lock_kernel();
  71 -       ret = ext3_ioctl(inode, file, cmd, (unsigned long) compat_ptr(arg));
  72 -       unlock_kernel();
  73 -       return ret;
  74 +       return ext3_ioctl(file, cmd, (unsigned long) compat_ptr(arg));
  75  }
  76  #endif
  77 diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
  78 index 241c01c..1c925eb 100644
  79 --- a/include/linux/ext3_fs.h
  80 +++ b/include/linux/ext3_fs.h
  81 @@ -838,8 +838,7 @@ extern void ext3_get_inode_flags(struct ext3_inode_info *);
  82  extern void ext3_set_aops(struct inode *inode);
  83
  84  /* ioctl.c */
  85 -extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
  86 -                      unsigned long);
  87 +extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
  88  extern long ext3_compat_ioctl (struct file *, unsigned int, unsigned long);
  89
  90  /* namei.c */