changed ioctls to unlocked
PATCH 5/13 changed ioctls to unlocked
From: Stoyan Gaydarov <[email protected]>
Signed-off-by Stoyan Gaydarov <[email protected]>
--- drivers/s390/char/tape_char.c | 47 +++++++++++++++++++++++---------- drivers/s390/char/vmwatchdog.c | 57 ++++++++++++++++++++++++++-------------- 2 files changed, 70 insertions(+), 34 deletions(-)
drivers/s390/char/tape_char.c +33 -14
@@ -35,8 +35,7 @@ static ssize_t tapechar_read(struct file *, char __user *, size_t, loff_t *);static ssize_t tapechar_write (struct file *,const char __user *,size_t ,loff_t *);static int tapechar_open (struct inode *,struct file *);static int tapechar_release (struct inode *,struct file *); -static int tapechar_ioctl (struct inode *,struct file *,unsigned int , -unsigned long ); +static long tapechar_ioctl (struct file *,unsigned int ,unsigned long );static long tapechar_compat_ioctl (struct file *,unsigned int ,unsigned long );
@@ -45,7 +44,7 @@ static const struct file_operations tape_fops = .owner = THIS_MODULE, .read = tapechar_read, .write = tapechar_write, - .ioctl = tapechar_ioctl, + .unlocked_ioctl = tapechar_ioctl, .compat_ioctl = tapechar_compat_ioctl, .open = tapechar_open, .release = tapechar_release,
@@ -354,13 +353,14 @@ tapechar_release(struct inode *inode, struct file *filp)/* * Tape device io controls. */ -static int -tapechar_ioctl (struct inode *inp,struct file *filp, -unsigned int no,unsigned long data) +static long +tapechar_ioctl (struct file *filp,unsigned int no,unsigned long data) {struct tape_device *device;int rc; +lock_kernel (); +DBF_EVENT (6 ,"TCHAR:ioct\n" ); device = (struct tape_device *) filp->private_data;
@@ -368,10 +368,14 @@ tapechar_ioctl(struct inode *inp, struct file *filp,if (no ==MTIOCTOP ) {struct mtop op; -if (copy_from_user (&op, (char __user *) data,sizeof (op)) !=0 ) +if (copy_from_user (&op, (char __user *) data,sizeof (op)) !=0 ) { +unlock_kernel ();return -EFAULT ; -if (op.mt_count <0 ) + } +if (op.mt_count <0 ) { +unlock_kernel ();return -EINVAL ; + }/* * Operations that change tape position should write final
@@ -405,6 +409,7 @@ tapechar_ioctl(struct inode *inp, struct file *filp,else device->required_tapemarks -= op.mt_count; } +unlock_kernel ();return rc; }if (no ==MTIOCPOS ) {
@@ -412,11 +417,16 @@ tapechar_ioctl(struct inode *inp, struct file *filp,struct mtpos pos; rc =tape_mtop (device,MTTELL ,1 ); -if (rc <0 ) +if (rc <0 ) { +unlock_kernel ();return rc; + } pos.mt_blkno = rc; -if (copy_to_user ((char __user *) data, &pos,sizeof (pos)) !=0 ) +if (copy_to_user ((char __user *) data, &pos,sizeof (pos)) !=0 ) { +unlock_kernel ();return -EFAULT ; + } +unlock_kernel ();return 0 ; }if (no ==MTIOCGET ) {
@@ -436,8 +446,10 @@ tapechar_ioctl(struct inode *inp, struct file *filp,if (device->medium_state ==MS_LOADED ) { rc =tape_mtop (device,MTTELL ,1 ); -if (rc <0 ) +if (rc <0 ) { +unlock_kernel ();return rc; + }if (rc ==0 ) get.mt_gstat |=GMT_BOT (~0 );
@@ -445,15 +457,22 @@ tapechar_ioctl(struct inode *inp, struct file *filp, get.mt_blkno = rc; } -if (copy_to_user ((char __user *) data, &get,sizeof (get)) !=0 ) +if (copy_to_user ((char __user *) data, &get,sizeof (get)) !=0 ) { +unlock_kernel ();return -EFAULT ; + } +unlock_kernel ();return 0 ; }/* Try the discipline ioctl function. */ -if (device->discipline->ioctl_fn ==NULL ) +if (device->discipline->ioctl_fn ==NULL ) { +unlock_kernel ();return -EINVAL ; -return device->discipline->ioctl_fn (device, no, data); + } +long ret = device->discipline->ioctl_fn (device, no, data); +unlock_kernel (); +return ret; } static long
drivers/s390/char/vmwatchdog.c +37 -20
97 lines not on this page · raw message
Signature · 1 line
1.6.2
Quoted 7 lines · On Tue, 24 Mar 2009 16:12:40 -0500 [email protected] wrote:
From: Stoyan Gaydarov <[email protected]>
Signed-off-by Stoyan Gaydarov <[email protected]>--- drivers/s390/char/tape_char.c | 47 +++++++++++++++++++++++---------- drivers/s390/char/vmwatchdog.c | 57 ++++++++++++++++++++++++++-------------- 2 files changed, 70 insertions(+), 34 deletions(-)
Please resend with the comments that Jonathan made for your other
patches: first define variables then lock_kernel() and also please use gotos.
Thanks!