Skip to content

L
linux
Commit 71db3852 authored by Andi Kleen's avatar Andi Kleen Committed by James Bottomley
Browse files
Options

[PATCH] Add compat_ioctl to mptctl 

Convert mptctl to compat_ioctl. I also changed it to unlocked_ioctl
while I was on it.
Signed-off-by: default avatarAndi Kleen <ak@muc.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 21062f4c
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 81 deletions
drivers/message/fusion/mptctl.c
View file @ 71db3852
...@@ -142,6 +142,10 @@ static int mptctl_hp_targetinfo(unsigned long arg); ...@@ -142,6 +142,10 @@ static int mptctl_hp_targetinfo(unsigned long arg);
static int mptctl_probe(struct pci_dev *, const struct pci_device_id *); static int mptctl_probe(struct pci_dev *, const struct pci_device_id *);
static void mptctl_remove(struct pci_dev *); static void mptctl_remove(struct pci_dev *);
#ifdef CONFIG_COMPAT
static long compat_mpctl_ioctl(struct file *f, unsigned cmd, unsigned long arg);
#endif
/* /*
* Private function calls. * Private function calls.
*/ */
...@@ -552,8 +556,8 @@ mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) ...@@ -552,8 +556,8 @@ mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
* cmd - specify the particular IOCTL command to be issued * cmd - specify the particular IOCTL command to be issued
* arg - data specific to the command. Must not be null. * arg - data specific to the command. Must not be null.
*/ */
static int static long
mptctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) __mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
mpt_ioctl_header __user *uhdr = (void __user *) arg; mpt_ioctl_header __user *uhdr = (void __user *) arg;
mpt_ioctl_header khdr; mpt_ioctl_header khdr;
...@@ -637,6 +641,16 @@ mptctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned ...@@ -637,6 +641,16 @@ mptctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
return ret; return ret;
} }
static long
mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
long ret;
lock_kernel();
ret = __mptctl_ioctl(file, cmd, arg);
unlock_kernel();
return ret;
}
static int mptctl_do_reset(unsigned long arg) static int mptctl_do_reset(unsigned long arg)
{ {
struct mpt_ioctl_diag_reset __user *urinfo = (void __user *) arg; struct mpt_ioctl_diag_reset __user *urinfo = (void __user *) arg;
...@@ -2669,7 +2683,10 @@ mptctl_hp_targetinfo(unsigned long arg) ...@@ -2669,7 +2683,10 @@ mptctl_hp_targetinfo(unsigned long arg)
static struct file_operations mptctl_fops = { static struct file_operations mptctl_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.ioctl = mptctl_ioctl, .unlocked_ioctl = mptctl_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = compat_mpctl_ioctl,
#endif
}; };
static struct miscdevice mptctl_miscdev = { static struct miscdevice mptctl_miscdev = {
...@@ -2691,22 +2708,10 @@ static struct miscdevice mptctl_miscdev = { ...@@ -2691,22 +2708,10 @@ static struct miscdevice mptctl_miscdev = {
* does contain pointer(s), then the specialized function is used * does contain pointer(s), then the specialized function is used
* to ensure the structure contents is properly processed by mptctl. * to ensure the structure contents is properly processed by mptctl.
*/ */
static int
compat_mptctl_ioctl(unsigned int fd, unsigned int cmd,
unsigned long arg, struct file *filp)
{
int ret;
lock_kernel();
dctlprintk((KERN_INFO MYNAM "::compat_mptctl_ioctl() called\n"));
ret = mptctl_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
unlock_kernel();
return ret;
}
static int static int
compat_mptfwxfer_ioctl(unsigned int fd, unsigned int cmd, compat_mptfwxfer_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg, struct file *filp) unsigned long arg)
{ {
struct mpt_fw_xfer32 kfw32; struct mpt_fw_xfer32 kfw32;
struct mpt_fw_xfer kfw; struct mpt_fw_xfer kfw;
...@@ -2744,8 +2749,8 @@ compat_mptfwxfer_ioctl(unsigned int fd, unsigned int cmd, ...@@ -2744,8 +2749,8 @@ compat_mptfwxfer_ioctl(unsigned int fd, unsigned int cmd,
} }
static int static int
compat_mpt_command(unsigned int fd, unsigned int cmd, compat_mpt_command(struct file *filp, unsigned int cmd,
unsigned long arg, struct file *filp) unsigned long arg)
{ {
struct mpt_ioctl_command32 karg32; struct mpt_ioctl_command32 karg32;
struct mpt_ioctl_command32 __user *uarg = (struct mpt_ioctl_command32 __user *) arg; struct mpt_ioctl_command32 __user *uarg = (struct mpt_ioctl_command32 __user *) arg;
...@@ -2797,6 +2802,38 @@ compat_mpt_command(unsigned int fd, unsigned int cmd, ...@@ -2797,6 +2802,38 @@ compat_mpt_command(unsigned int fd, unsigned int cmd,
return ret; return ret;
} }
static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
{
int ret;
lock_kernel();
switch (cmd) {
case MPTIOCINFO:
case MPTIOCINFO1:
case MPTIOCINFO2:
case MPTTARGETINFO:
case MPTEVENTQUERY:
case MPTEVENTENABLE:
case MPTEVENTREPORT:
case MPTHARDRESET:
case HP_GETHOSTINFO:
case HP_GETTARGETINFO:
case MPTTEST:
ret = __mptctl_ioctl(f, cmd, arg);
break;
case MPTCOMMAND32:
ret = compat_mpt_command(f, cmd, arg);
break;
case MPTFWDOWNLOAD32:
ret = compat_mptfwxfer_ioctl(f, cmd, arg);
break;
default:
ret = -ENOIOCTLCMD;
break;
}
unlock_kernel();
return ret;
}
#endif #endif
...@@ -2879,35 +2916,6 @@ static int __init mptctl_init(void) ...@@ -2879,35 +2916,6 @@ static int __init mptctl_init(void)
": failed to register dd callbacks\n")); ": failed to register dd callbacks\n"));
} }
#ifdef CONFIG_COMPAT
err = register_ioctl32_conversion(MPTIOCINFO, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTIOCINFO1, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTIOCINFO2, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTTARGETINFO, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTTEST, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTEVENTQUERY, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTEVENTENABLE, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTEVENTREPORT, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTHARDRESET, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTCOMMAND32, compat_mpt_command);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(MPTFWDOWNLOAD32,
compat_mptfwxfer_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(HP_GETHOSTINFO, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
err = register_ioctl32_conversion(HP_GETTARGETINFO, compat_mptctl_ioctl);
if (++where && err) goto out_fail;
#endif
/* Register this device */ /* Register this device */
err = misc_register(&mptctl_miscdev); err = misc_register(&mptctl_miscdev);
...@@ -2940,23 +2948,6 @@ static int __init mptctl_init(void) ...@@ -2940,23 +2948,6 @@ static int __init mptctl_init(void)
out_fail: out_fail:
#ifdef CONFIG_COMPAT
printk(KERN_ERR MYNAM ": ERROR: Failed to register ioctl32_conversion!"
" (%d:err=%d)\n", where, err);
unregister_ioctl32_conversion(MPTIOCINFO);
unregister_ioctl32_conversion(MPTIOCINFO1);
unregister_ioctl32_conversion(MPTIOCINFO2);
unregister_ioctl32_conversion(MPTTARGETINFO);
unregister_ioctl32_conversion(MPTTEST);
unregister_ioctl32_conversion(MPTEVENTQUERY);
unregister_ioctl32_conversion(MPTEVENTENABLE);
unregister_ioctl32_conversion(MPTEVENTREPORT);
unregister_ioctl32_conversion(MPTHARDRESET);
unregister_ioctl32_conversion(MPTCOMMAND32);
unregister_ioctl32_conversion(MPTFWDOWNLOAD32);
unregister_ioctl32_conversion(HP_GETHOSTINFO);
unregister_ioctl32_conversion(HP_GETTARGETINFO);
#endif
mpt_device_driver_deregister(MPTCTL_DRIVER); mpt_device_driver_deregister(MPTCTL_DRIVER);
...@@ -2980,22 +2971,6 @@ static void mptctl_exit(void) ...@@ -2980,22 +2971,6 @@ static void mptctl_exit(void)
mpt_device_driver_deregister(MPTCTL_DRIVER); mpt_device_driver_deregister(MPTCTL_DRIVER);
#ifdef CONFIG_COMPAT
unregister_ioctl32_conversion(MPTIOCINFO);
unregister_ioctl32_conversion(MPTIOCINFO1);
unregister_ioctl32_conversion(MPTIOCINFO2);
unregister_ioctl32_conversion(MPTTARGETINFO);
unregister_ioctl32_conversion(MPTTEST);
unregister_ioctl32_conversion(MPTEVENTQUERY);
unregister_ioctl32_conversion(MPTEVENTENABLE);
unregister_ioctl32_conversion(MPTEVENTREPORT);
unregister_ioctl32_conversion(MPTHARDRESET);
unregister_ioctl32_conversion(MPTCOMMAND32);
unregister_ioctl32_conversion(MPTFWDOWNLOAD32);
unregister_ioctl32_conversion(HP_GETHOSTINFO);
unregister_ioctl32_conversion(HP_GETTARGETINFO);
#endif
} }
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
......
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