tree 02fcab1d91a740f3f63788a0daf8ebf06844dbcf
parent 0db7157ca47e21c7623a59e710b807ad06fce161
author <[EMAIL PROTECTED]> Mon, 11 Apr 2005 08:29:42 -0500
committer James Bottomley <[EMAIL PROTECTED]> Sun, 17 Apr 2005 06:15:17 -0500
[PATCH] Convert i2o to compat_ioctl
Also broken design in its compat handlers - CONFIG_COMPAT doesn't
mean that there should be no native ioctls.
Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
Reworked with comments from Markus Lidel by:
Christoph Hellwig <[EMAIL PROTECTED]>
Rejections fixed and
Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
message/i2o/i2o_config.c | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
Index: drivers/message/i2o/i2o_config.c
===================================================================
--- 932c6f9689fd08a7a9d689cfbec8682ccde8175d/drivers/message/i2o/i2o_config.c
(mode:100644 sha1:5fc5004ea07a316a2cc4f5f3a6eab7823490b987)
+++ 02fcab1d91a740f3f63788a0daf8ebf06844dbcf/drivers/message/i2o/i2o_config.c
(mode:100644 sha1:1fb5cdf67f8fa82e6245586bdf151da6a26d60a7)
@@ -54,6 +54,9 @@
extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int);
+static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int
cmd,
+ unsigned long arg);
+
static spinlock_t i2o_config_lock;
#define MODINC(x,y) ((x) = ((x) + 1) % (y))
@@ -538,8 +541,7 @@
}
#ifdef CONFIG_COMPAT
-static int i2o_cfg_passthru32(unsigned fd, unsigned cmnd, unsigned long arg,
- struct file *file)
+static int i2o_cfg_passthru32(struct file *file, unsigned cmnd, unsigned long
arg)
{
struct i2o_cmd_passthru32 __user *cmd;
struct i2o_controller *c;
@@ -752,7 +754,26 @@
return rcode;
}
-#else
+static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd, unsigned
long arg)
+{
+ int ret;
+ lock_kernel();
+ switch (cmd) {
+ case I2OGETIOPS:
+ ret = i2o_cfg_ioctl(NULL, file, cmd, arg);
+ break;
+ case I2OPASSTHRU32:
+ ret = i2o_cfg_passthru32(file, cmd, arg);
+ break;
+ default:
+ ret = -ENOIOCTLCMD;
+ break;
+ }
+ unlock_kernel();
+ return ret;
+}
+
+#endif
static int i2o_cfg_passthru(unsigned long arg)
{
@@ -958,7 +979,6 @@
kfree(reply);
return rcode;
}
-#endif
/*
* IOCTL Handler
@@ -1013,11 +1033,9 @@
ret = i2o_cfg_evt_get(arg, fp);
break;
-#ifndef CONFIG_COMPAT
case I2OPASSTHRU:
ret = i2o_cfg_passthru(arg);
break;
-#endif
default:
osm_debug("unknown ioctl called!\n");
@@ -1105,6 +1123,9 @@
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = i2o_cfg_ioctl,
+#ifdef CONFIG_COMPAT
+ .compat_ioctl = i2o_cfg_compat_ioctl,
+#endif
.open = cfg_open,
.release = cfg_release,
.fasync = cfg_fasync,
@@ -1134,19 +1155,11 @@
misc_deregister(&i2o_miscdev);
return -EBUSY;
}
-#ifdef CONFIG_COMPAT
- register_ioctl32_conversion(I2OPASSTHRU32, i2o_cfg_passthru32);
- register_ioctl32_conversion(I2OGETIOPS, (void *)sys_ioctl);
-#endif
return 0;
}
static void i2o_config_exit(void)
{
-#ifdef CONFIG_COMPAT
- unregister_ioctl32_conversion(I2OPASSTHRU32);
- unregister_ioctl32_conversion(I2OGETIOPS);
-#endif
misc_deregister(&i2o_miscdev);
i2o_driver_unregister(&i2o_config_driver);
}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
