Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

* 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  uml: Pushdown the bkl from harddog_kern ioctl
  sunrpc: Pushdown the bkl from sunrpc cache ioctl
  sunrpc: Pushdown the bkl from ioctl
  autofs4: Pushdown the bkl from ioctl
  uml: Convert to unlocked_ioctls to remove implicit BKL
  ncpfs: BKL ioctl pushdown
  coda: Clean-up whitespace problems in pioctl.c
  coda: BKL ioctl pushdown
  drivers: Push down BKL into various drivers
  isdn: Push down BKL into ioctl functions
  scsi: Push down BKL into ioctl functions
  dvb: Push down BKL into ioctl functions
  smbfs: Push down BKL into ioctl function
  coda/psdev: Remove BKL from ioctl function
  um/mmapper: Remove BKL usage
  sn_hwperf: Kill BKL usage
  hfsplus: Push down BKL into ioctl function

1 files changed, 24 insertions, 18 deletions

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 8756ab0daa8b..b38942f6bf31 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -121,13 +121,17 @@ static int raw_release(struct inode *inode, struct file *filp)
 /*
  * Forward ioctls to the underlying block device.
  */
-static int
-raw_ioctl(struct inode *inode, struct file *filp,
-                  unsigned int command, unsigned long arg)
+static long
+raw_ioctl(struct file *filp, unsigned int command, unsigned long arg)
 {
         struct block_device *bdev = filp->private_data;
+        int ret;
+
+        lock_kernel();
+        ret = blkdev_ioctl(bdev, 0, command, arg);
+        unlock_kernel();
 
-        return blkdev_ioctl(bdev, 0, command, arg);
+        return ret;
 }
 
 static void bind_device(struct raw_config_request *rq)
@@ -141,13 +145,14 @@ static void bind_device(struct raw_config_request *rq)
  * Deal with ioctls against the raw-device control interface, to bind
  * and unbind other raw devices.
  */
-static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
-                        unsigned int command, unsigned long arg)
+static long raw_ctl_ioctl(struct file *filp, unsigned int command,
+                          unsigned long arg)
 {
         struct raw_config_request rq;
         struct raw_device_data *rawdev;
         int err = 0;
 
+        lock_kernel();
         switch (command) {
         case RAW_SETBIND:
         case RAW_GETBIND:
@@ -240,25 +245,26 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
                 break;
         }
 out:
+        unlock_kernel();
         return err;
 }
 
 static const struct file_operations raw_fops = {
-        .read   =       do_sync_read,
-        .aio_read =     generic_file_aio_read,
-        .write  =       do_sync_write,
-        .aio_write =    blkdev_aio_write,
-        .fsync  =       blkdev_fsync,
-        .open   =       raw_open,
-        .release=       raw_release,
-        .ioctl  =       raw_ioctl,
-        .owner  =       THIS_MODULE,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = blkdev_aio_write,
+        .fsync          = blkdev_fsync,
+        .open           = raw_open,
+        .release        = raw_release,
+        .unlocked_ioctl = raw_ioctl,
+        .owner          = THIS_MODULE,
 };
 
 static const struct file_operations raw_ctl_fops = {
-        .ioctl  =       raw_ctl_ioctl,
-        .open   =       raw_open,
-        .owner  =       THIS_MODULE,
+        .unlocked_ioctl = raw_ctl_ioctl,
+        .open           = raw_open,
+        .owner          = THIS_MODULE,
 };
 
 static struct cdev raw_cdev;