tree 49e1e0d32f6e5104b670d2d263003b5cab8b647e
parent cb59e840838193957a84ad22f7e1465a06a7c10c
author <[EMAIL PROTECTED]> Sun, 03 Apr 2005 01:57:17 -0600
committer James Bottomley <[EMAIL PROTECTED]> Sun, 17 Apr 2005 06:09:17 -0500
[PATCH] zfcp: convert to compat_ioctl
Signed-off-by: Andreas Herrmann <[EMAIL PROTECTED]>
Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
s390/scsi/zfcp_aux.c | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
Index: drivers/s390/scsi/zfcp_aux.c
===================================================================
--- d47f9779a52eb782962dc3406ef0de6100a29dfa/drivers/s390/scsi/zfcp_aux.c
(mode:100644 sha1:6a43322ccb0a570a99e9ebe1dfabec475728ca47)
+++ 49e1e0d32f6e5104b670d2d263003b5cab8b647e/drivers/s390/scsi/zfcp_aux.c
(mode:100644 sha1:ce398aa9e0195f1a0abd208e68de2313060f8052)
@@ -52,19 +52,18 @@
static inline int zfcp_sg_list_copy_to_user(void __user *,
struct zfcp_sg_list *, size_t);
-static int zfcp_cfdc_dev_ioctl(struct inode *, struct file *,
- unsigned int, unsigned long);
+static int zfcp_cfdc_dev_ioctl(struct file *, unsigned int, unsigned long);
#define ZFCP_CFDC_IOC_MAGIC 0xDD
#define ZFCP_CFDC_IOC \
_IOWR(ZFCP_CFDC_IOC_MAGIC, 0, struct zfcp_cfdc_sense_data)
-#ifdef CONFIG_COMPAT
-static struct ioctl_trans zfcp_ioctl_trans = {ZFCP_CFDC_IOC, (void*)
sys_ioctl};
-#endif
static struct file_operations zfcp_cfdc_fops = {
- .ioctl = zfcp_cfdc_dev_ioctl
+ .unlocked_ioctl = zfcp_cfdc_dev_ioctl,
+#ifdef CONFIG_COMPAT
+ .compat_ioctl = zfcp_cfdc_dev_ioctl
+#endif
};
static struct miscdevice zfcp_cfdc_misc = {
@@ -308,23 +307,16 @@
if (!zfcp_transport_template)
return -ENODEV;
- retval = register_ioctl32_conversion(zfcp_ioctl_trans.cmd,
- zfcp_ioctl_trans.handler);
- if (retval != 0) {
- ZFCP_LOG_INFO("registration of ioctl32 conversion failed\n");
- goto out;
- }
-
retval = misc_register(&zfcp_cfdc_misc);
if (retval != 0) {
ZFCP_LOG_INFO("registration of misc device "
"zfcp_cfdc failed\n");
- goto out_misc_register;
- } else {
- ZFCP_LOG_TRACE("major/minor for zfcp_cfdc: %d/%d\n",
- ZFCP_CFDC_DEV_MAJOR, zfcp_cfdc_misc.minor);
+ goto out;
}
+ ZFCP_LOG_TRACE("major/minor for zfcp_cfdc: %d/%d\n",
+ ZFCP_CFDC_DEV_MAJOR, zfcp_cfdc_misc.minor);
+
/* Initialise proc semaphores */
sema_init(&zfcp_data.config_sema, 1);
@@ -348,8 +340,6 @@
out_ccw_register:
misc_deregister(&zfcp_cfdc_misc);
- out_misc_register:
- unregister_ioctl32_conversion(zfcp_ioctl_trans.cmd);
out:
return retval;
}
@@ -370,9 +360,9 @@
* -EPERM - Cannot create or queue FSF request or create
SBALs
* -ERESTARTSYS- Received signal (is mapped to EAGAIN by VFS)
*/
-static int
-zfcp_cfdc_dev_ioctl(struct inode *inode, struct file *file,
- unsigned int command, unsigned long buffer)
+static long
+zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
+ unsigned long buffer)
{
struct zfcp_cfdc_sense_data *sense_data, __user *sense_data_user;
struct zfcp_adapter *adapter = NULL;
-
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
