drivers: Push down BKL into various drivers

These are the last remaining device drivers using
the ->ioctl file operation in the drivers directory
(except from v4l drivers).

[fweisbec: drop i8k pushdown as it has been done from
procfs pushdown branch already]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

2 files changed, 36 insertions, 7 deletions

diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 65545de3dbf4..d8ec92a38980 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -228,8 +228,7 @@ static int handle_send_req(ipmi_user_t     user,
         return rv;
 }
 
-static int ipmi_ioctl(struct inode  *inode,
-                      struct file   *file,
+static int ipmi_ioctl(struct file   *file,
                       unsigned int  cmd,
                       unsigned long data)
 {
@@ -630,6 +629,23 @@ static int ipmi_ioctl(struct inode  *inode,
         return rv;
 }
 
+/*
+ * Note: it doesn't make sense to take the BKL here but
+ *       not in compat_ipmi_ioctl. -arnd
+ */
+static long ipmi_unlocked_ioctl(struct file   *file,
+                                unsigned int  cmd,
+                                unsigned long data)
+{
+        int ret;
+
+        lock_kernel();
+        ret = ipmi_ioctl(file, cmd, data);
+        unlock_kernel();
+
+        return ret;
+}
+
 #ifdef CONFIG_COMPAT
 
 /*
@@ -802,7 +818,7 @@ static long compat_ipmi_ioctl(struct file *filep, unsigned int cmd,
                 if (copy_to_user(precv64, &recv64, sizeof(recv64)))
                         return -EFAULT;
 
-                rc = ipmi_ioctl(filep->f_path.dentry->d_inode, filep,
+                rc = ipmi_ioctl(filep,
                                 ((cmd == COMPAT_IPMICTL_RECEIVE_MSG)
                                  ? IPMICTL_RECEIVE_MSG
                                  : IPMICTL_RECEIVE_MSG_TRUNC),
@@ -819,14 +835,14 @@ static long compat_ipmi_ioctl(struct file *filep, unsigned int cmd,
                 return rc;
         }
         default:
-                return ipmi_ioctl(filep->f_path.dentry->d_inode, filep, cmd, arg);
+                return ipmi_ioctl(filep, cmd, arg);
         }
 }
 #endif
 
 static const struct file_operations ipmi_fops = {
         .owner          = THIS_MODULE,
-        .ioctl          = ipmi_ioctl,
+        .unlocked_ioctl = ipmi_unlocked_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = compat_ipmi_ioctl,
 #endif
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index a4d57e31f713..82bcdb262a3a 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -659,7 +659,7 @@ static struct watchdog_info ident = {
         .identity       = "IPMI"
 };
 
-static int ipmi_ioctl(struct inode *inode, struct file *file,
+static int ipmi_ioctl(struct file *file,
                       unsigned int cmd, unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
@@ -730,6 +730,19 @@ static int ipmi_ioctl(struct inode *inode, struct file *file,
         }
 }
 
+static long ipmi_unlocked_ioctl(struct file *file,
+                                unsigned int cmd,
+                                unsigned long arg)
+{
+        int ret;
+
+        lock_kernel();
+        ret = ipmi_ioctl(file, cmd, arg);
+        unlock_kernel();
+
+        return ret;
+}
+
 static ssize_t ipmi_write(struct file *file,
                           const char  __user *buf,
                           size_t      len,
@@ -880,7 +893,7 @@ static const struct file_operations ipmi_wdog_fops = {
         .read    = ipmi_read,
         .poll    = ipmi_poll,
         .write   = ipmi_write,
-        .ioctl   = ipmi_ioctl,
+        .unlocked_ioctl = ipmi_unlocked_ioctl,
         .open    = ipmi_open,
         .release = ipmi_close,
         .fasync  = ipmi_fasync,