cosa: Kill off the use of the old ioctl path
Subsystems (2)
PATCH 1/1 cosa: Kill off the use of the old ioctl path
Signed-off-by Alan Cox <[email protected]>
---
drivers/message/i2o/i2o_config.c | 5 ++--- drivers/net/wan/cosa.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-)
drivers/message/i2o/i2o_config.c +2 -3
@@ -40,8 +40,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;
@@ -1118,7 +1117,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
drivers/net/wan/cosa.c +12 -6
@@ -297,8 +297,8 @@ static ssize_t cosa_write(struct file *file,static unsigned int cosa_poll (struct file *file,poll_table *poll);static int cosa_open (struct inode *inode,struct file *file);static int cosa_release (struct inode *inode,struct file *file); -static int cosa_chardev_ioctl (struct inode *inode,struct file *file, -unsigned int cmd,unsigned long arg); +static long cosa_chardev_ioctl (struct file *file,unsigned int cmd, +unsigned long arg);#ifdef COSA_FASYNC_WORKING static int cosa_fasync (struct inode *inode,struct file *file,int on);#endif
@@ -1204,12 +1204,18 @@ static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return hdlc_ioctl (dev, ifr, cmd); } -static int cosa_chardev_ioctl (struct inode *inode,struct file *file, -unsigned int cmd,unsigned long arg) +static long cosa_chardev_ioctl (struct file *file,unsigned int cmd, +unsigned long arg) {struct channel_data *channel = file->private_data; -struct cosa_data *cosa = channel->cosa; -return cosa_ioctl_common (cosa, channel, cmd, arg); +struct cosa_data *cosa; +long ret; + +lock_kernel (); + cosa = channel->cosa; + ret =cosa_ioctl_common (cosa, channel, cmd, arg); +unlock_kernel (); +return ret; }
David Miller
maintainerFrom: Alan Cox <[email protected]>
Date: Tue, 13 Oct 2009 16:30:46 +0100
Quoted 6 lines
Signed-off-by Alan Cox <[email protected]>---
drivers/message/i2o/i2o_config.c | 5 ++--- drivers/net/wan/cosa.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-)
I don't think you meant to put the I2O bits in here. :-)
Please fully resubmit this with that fixed up.
Thanks!