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

3 files changed, 35 insertions, 10 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index ee5837522f5..0cabe31f26d 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -787,8 +787,7 @@ capi_poll(struct file *file, poll_table * wait)
 }
 
 static int
-capi_ioctl(struct inode *inode, struct file *file,
-           unsigned int cmd, unsigned long arg)
+capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         struct capidev *cdev = file->private_data;
         capi_ioctl_struct data;
@@ -981,6 +980,18 @@ register_out:
         }
 }
 
+static long
+capi_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        int ret;
+
+        lock_kernel();
+        ret = capi_ioctl(file, cmd, arg);
+        unlock_kernel();
+
+        return ret;
+}
+
 static int capi_open(struct inode *inode, struct file *file)
 {
         struct capidev *cdev;
@@ -1026,7 +1037,7 @@ static const struct file_operations capi_fops =
         .read           = capi_read,
         .write          = capi_write,
         .poll           = capi_poll,
-        .ioctl          = capi_ioctl,
+        .unlocked_ioctl = capi_unlocked_ioctl,
         .open           = capi_open,
         .release        = capi_release,
 };
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 70044ee4b22..a44cdb492ea 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1272,9 +1272,9 @@ isdn_poll(struct file *file, poll_table * wait)
 
 
 static int
-isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
+isdn_ioctl(struct file *file, uint cmd, ulong arg)
 {
-        uint minor = iminor(inode);
+        uint minor = iminor(file->f_path.dentry->d_inode);
         isdn_ctrl c;
         int drvidx;
         int chidx;
@@ -1722,6 +1722,18 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
 #undef cfg
 }
 
+static long
+isdn_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        int ret;
+
+        lock_kernel();
+        ret = isdn_ioctl(file, cmd, arg);
+        unlock_kernel();
+
+        return ret;
+}
+
 /*
  * Open the device code.
  */
@@ -1838,7 +1850,7 @@ static const struct file_operations isdn_fops =
         .read           = isdn_read,
         .write          = isdn_write,
         .poll           = isdn_poll,
-        .ioctl          = isdn_ioctl,
+        .unlocked_ioctl = isdn_unlocked_ioctl,
         .open           = isdn_open,
         .release        = isdn_close,
 };
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index 8785004e85e..c3243c913ec 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -24,6 +24,7 @@
 #include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/mISDNif.h>
+#include <linux/smp_lock.h>
 #include "core.h"
 
 static u_int    *debug;
@@ -215,9 +216,8 @@ unlock:
         return ret;
 }
 
-static int
-mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
-    unsigned long arg)
+static long
+mISDN_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
 {
         struct mISDNtimerdev    *dev = filep->private_data;
         int                     id, tout, ret = 0;
@@ -226,6 +226,7 @@ mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
         if (*debug & DEBUG_TIMER)
                 printk(KERN_DEBUG "%s(%p, %x, %lx)\n", __func__,
                     filep, cmd, arg);
+        lock_kernel();
         switch (cmd) {
         case IMADDTIMER:
                 if (get_user(tout, (int __user *)arg)) {
@@ -257,13 +258,14 @@ mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
         default:
                 ret = -EINVAL;
         }
+        unlock_kernel();
         return ret;
 }
 
 static const struct file_operations mISDN_fops = {
         .read           = mISDN_read,
         .poll           = mISDN_poll,
-        .ioctl          = mISDN_ioctl,
+        .unlocked_ioctl = mISDN_ioctl,
         .open           = mISDN_open,
         .release        = mISDN_close,
 };