Skip to content

L
linux
Commit e7c29199 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files
Options

[PATCH] Convert cciss to compat_ioctl 

Convert the cciss driver to compat_ioctl.  This cleans up a lot of code.

I don't have such hardware thus this is only compile tested.
Signed-off-by: default avatarAndi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 62dce069
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 77 deletions
drivers/block/cciss.c
View file @ e7c29199
...@@ -146,11 +146,18 @@ static void cciss_procinit(int i); ...@@ -146,11 +146,18 @@ static void cciss_procinit(int i);
static void cciss_procinit(int i) {} static void cciss_procinit(int i) {}
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
#ifdef CONFIG_COMPAT
static int cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
#endif
static struct block_device_operations cciss_fops = { static struct block_device_operations cciss_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = cciss_open, .open = cciss_open,
.release = cciss_release, .release = cciss_release,
.ioctl = cciss_ioctl, .ioctl = cciss_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = cciss_compat_ioctl,
#endif
.revalidate_disk= cciss_revalidate, .revalidate_disk= cciss_revalidate,
}; };
...@@ -477,80 +484,50 @@ static int cciss_release(struct inode *inode, struct file *filep) ...@@ -477,80 +484,50 @@ static int cciss_release(struct inode *inode, struct file *filep)
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
/* for AMD 64 bit kernel compatibility with 32-bit userland ioctls */
extern long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg); static int do_ioctl(struct file *f, unsigned cmd, unsigned long arg)
extern int
register_ioctl32_conversion(unsigned int cmd, int (*handler)(unsigned int,
unsigned int, unsigned long, struct file *));
extern int unregister_ioctl32_conversion(unsigned int cmd);
static int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg, struct file *file);
static int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
struct file *file);
typedef int (*handler_type) (unsigned int, unsigned int, unsigned long, struct file *);
static struct ioctl32_map {
unsigned int cmd;
handler_type handler;
int registered;
} cciss_ioctl32_map[] = {
{ CCISS_GETPCIINFO, (handler_type) sys_ioctl, 0 },
{ CCISS_GETINTINFO, (handler_type) sys_ioctl, 0 },
{ CCISS_SETINTINFO, (handler_type) sys_ioctl, 0 },
{ CCISS_GETNODENAME, (handler_type) sys_ioctl, 0 },
{ CCISS_SETNODENAME, (handler_type) sys_ioctl, 0 },
{ CCISS_GETHEARTBEAT, (handler_type) sys_ioctl, 0 },
{ CCISS_GETBUSTYPES, (handler_type) sys_ioctl, 0 },
{ CCISS_GETFIRMVER, (handler_type) sys_ioctl, 0 },
{ CCISS_GETDRIVVER, (handler_type) sys_ioctl, 0 },
{ CCISS_REVALIDVOLS, (handler_type) sys_ioctl, 0 },
{ CCISS_PASSTHRU32, cciss_ioctl32_passthru, 0 },
{ CCISS_DEREGDISK, (handler_type) sys_ioctl, 0 },
{ CCISS_REGNEWDISK, (handler_type) sys_ioctl, 0 },
{ CCISS_REGNEWD, (handler_type) sys_ioctl, 0 },
{ CCISS_RESCANDISK, (handler_type) sys_ioctl, 0 },
{ CCISS_GETLUNINFO, (handler_type) sys_ioctl, 0 },
{ CCISS_BIG_PASSTHRU32, cciss_ioctl32_big_passthru, 0 },
};
#define NCCISS_IOCTL32_ENTRIES (sizeof(cciss_ioctl32_map) / sizeof(cciss_ioctl32_map[0]))
static void register_cciss_ioctl32(void)
{ {
int i, rc; int ret;
lock_kernel();
for (i=0; i < NCCISS_IOCTL32_ENTRIES; i++) { ret = cciss_ioctl(f->f_dentry->d_inode, f, cmd, arg);
rc = register_ioctl32_conversion( unlock_kernel();
cciss_ioctl32_map[i].cmd, return ret;
cciss_ioctl32_map[i].handler);
if (rc != 0) {
printk(KERN_WARNING "cciss: failed to register "
"32 bit compatible ioctl 0x%08x\n",
cciss_ioctl32_map[i].cmd);
cciss_ioctl32_map[i].registered = 0;
} else
cciss_ioctl32_map[i].registered = 1;
}
} }
static void unregister_cciss_ioctl32(void)
static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long arg);
static int cciss_ioctl32_big_passthru(struct file *f, unsigned cmd, unsigned long arg);
static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg)
{ {
int i, rc; switch (cmd) {
case CCISS_GETPCIINFO:
case CCISS_GETINTINFO:
case CCISS_SETINTINFO:
case CCISS_GETNODENAME:
case CCISS_SETNODENAME:
case CCISS_GETHEARTBEAT:
case CCISS_GETBUSTYPES:
case CCISS_GETFIRMVER:
case CCISS_GETDRIVVER:
case CCISS_REVALIDVOLS:
case CCISS_DEREGDISK:
case CCISS_REGNEWDISK:
case CCISS_REGNEWD:
case CCISS_RESCANDISK:
case CCISS_GETLUNINFO:
return do_ioctl(f, cmd, arg);
for (i=0; i < NCCISS_IOCTL32_ENTRIES; i++) { case CCISS_PASSTHRU32:
if (!cciss_ioctl32_map[i].registered) return cciss_ioctl32_passthru(f, cmd, arg);
continue; case CCISS_BIG_PASSTHRU32:
rc = unregister_ioctl32_conversion( return cciss_ioctl32_big_passthru(f, cmd, arg);
cciss_ioctl32_map[i].cmd);
if (rc == 0) { default:
cciss_ioctl32_map[i].registered = 0; return -ENOIOCTLCMD;
continue;
}
printk(KERN_WARNING "cciss: failed to unregister "
"32 bit compatible ioctl 0x%08x\n",
cciss_ioctl32_map[i].cmd);
} }
} }
int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
struct file *file) static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long arg)
{ {
IOCTL32_Command_struct __user *arg32 = IOCTL32_Command_struct __user *arg32 =
(IOCTL32_Command_struct __user *) arg; (IOCTL32_Command_struct __user *) arg;
...@@ -571,7 +548,7 @@ int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg, ...@@ -571,7 +548,7 @@ int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
if (err) if (err)
return -EFAULT; return -EFAULT;
err = sys_ioctl(fd, CCISS_PASSTHRU, (unsigned long) p); err = do_ioctl(f, CCISS_PASSTHRU, (unsigned long) p);
if (err) if (err)
return err; return err;
err |= copy_in_user(&arg32->error_info, &p->error_info, sizeof(arg32->error_info)); err |= copy_in_user(&arg32->error_info, &p->error_info, sizeof(arg32->error_info));
...@@ -580,8 +557,7 @@ int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg, ...@@ -580,8 +557,7 @@ int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
return err; return err;
} }
int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg, static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd, unsigned long arg)
struct file *file)
{ {
BIG_IOCTL32_Command_struct __user *arg32 = BIG_IOCTL32_Command_struct __user *arg32 =
(BIG_IOCTL32_Command_struct __user *) arg; (BIG_IOCTL32_Command_struct __user *) arg;
...@@ -603,7 +579,7 @@ int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg, ...@@ -603,7 +579,7 @@ int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
if (err) if (err)
return -EFAULT; return -EFAULT;
err = sys_ioctl(fd, CCISS_BIG_PASSTHRU, (unsigned long) p); err = do_ioctl(file, CCISS_BIG_PASSTHRU, (unsigned long) p);
if (err) if (err)
return err; return err;
err |= copy_in_user(&arg32->error_info, &p->error_info, sizeof(arg32->error_info)); err |= copy_in_user(&arg32->error_info, &p->error_info, sizeof(arg32->error_info));
...@@ -611,9 +587,6 @@ int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg, ...@@ -611,9 +587,6 @@ int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
return -EFAULT; return -EFAULT;
return err; return err;
} }
#else
static inline void register_cciss_ioctl32(void) {}
static inline void unregister_cciss_ioctl32(void) {}
#endif #endif
/* /*
* ioctl * ioctl
...@@ -2915,7 +2888,6 @@ int __init cciss_init(void) ...@@ -2915,7 +2888,6 @@ int __init cciss_init(void)
static int __init init_cciss_module(void) static int __init init_cciss_module(void)
{ {
register_cciss_ioctl32();
return ( cciss_init()); return ( cciss_init());
} }
...@@ -2923,7 +2895,6 @@ static void __exit cleanup_cciss_module(void) ...@@ -2923,7 +2895,6 @@ static void __exit cleanup_cciss_module(void)
{ {
int i; int i;
unregister_cciss_ioctl32();
pci_unregister_driver(&cciss_pci_driver); pci_unregister_driver(&cciss_pci_driver);
/* double check that all controller entrys have been removed */ /* double check that all controller entrys have been removed */
for (i=0; i< MAX_CTLR; i++) for (i=0; i< MAX_CTLR; i++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7