Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index efba7021948a..11073fa3d9f4 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -33,6 +33,7 @@
 #include <linux/miscdevice.h>
 #include <linux/smp_lock.h>
 #include <linux/compat.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 
@@ -40,8 +41,7 @@
 
 #define SG_TABLESIZE            30
 
-static int i2o_cfg_ioctl(struct inode *, struct file *, unsigned int,
-                         unsigned long);
+static long i2o_cfg_ioctl(struct file *, unsigned int, unsigned long);
 
 static spinlock_t i2o_config_lock;
 
@@ -751,7 +751,7 @@ static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd,
         lock_kernel();
         switch (cmd) {
         case I2OGETIOPS:
-                ret = i2o_cfg_ioctl(NULL, file, cmd, arg);
+                ret = i2o_cfg_ioctl(file, cmd, arg);
                 break;
         case I2OPASSTHRU32:
                 ret = i2o_cfg_passthru32(file, cmd, arg);
@@ -984,11 +984,11 @@ out:
 /*
  * IOCTL Handler
  */
-static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd,
-                         unsigned long arg)
+static long i2o_cfg_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 {
         int ret;
 
+        lock_kernel();
         switch (cmd) {
         case I2OGETIOPS:
                 ret = i2o_cfg_getiops(arg);
@@ -1044,7 +1044,7 @@ static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd,
                 osm_debug("unknown ioctl called!\n");
                 ret = -EINVAL;
         }
-
+        unlock_kernel();
         return ret;
 }
 
@@ -1118,7 +1118,7 @@ static int cfg_release(struct inode *inode, struct file *file)
 static const struct file_operations config_fops = {
         .owner = THIS_MODULE,
         .llseek = no_llseek,
-        .ioctl = i2o_cfg_ioctl,
+        .unlocked_ioctl = i2o_cfg_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = i2o_cfg_compat_ioctl,
 #endif