Procházet zdrojové kódy

USB: iowarrior: Push down BKL

I'm pretty sure the mutex is sufficient for all locking but will come
back to that later if the USB folks don't beat me to it. For now get rid
of the old BKL ioctl method and wrap the ioctl handler

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox před 17 roky
rodič
revize
824f16fda5
1 změnil soubory, kde provedl 5 přidání a 3 odebrání
  1. 5 3
      drivers/usb/misc/iowarrior.c

+ 5 - 3
drivers/usb/misc/iowarrior.c

@@ -474,8 +474,8 @@ exit:
 /**
 /**
  *	iowarrior_ioctl
  *	iowarrior_ioctl
  */
  */
-static int iowarrior_ioctl(struct inode *inode, struct file *file,
-			   unsigned int cmd, unsigned long arg)
+static long iowarrior_ioctl(struct file *file, unsigned int cmd,
+							unsigned long arg)
 {
 {
 	struct iowarrior *dev = NULL;
 	struct iowarrior *dev = NULL;
 	__u8 *buffer;
 	__u8 *buffer;
@@ -493,6 +493,7 @@ static int iowarrior_ioctl(struct inode *inode, struct file *file,
 		return -ENOMEM;
 		return -ENOMEM;
 
 
 	/* lock this object */
 	/* lock this object */
+	lock_kernel();
 	mutex_lock(&dev->mutex);
 	mutex_lock(&dev->mutex);
 
 
 	/* verify that the device wasn't unplugged */
 	/* verify that the device wasn't unplugged */
@@ -584,6 +585,7 @@ static int iowarrior_ioctl(struct inode *inode, struct file *file,
 error_out:
 error_out:
 	/* unlock the device */
 	/* unlock the device */
 	mutex_unlock(&dev->mutex);
 	mutex_unlock(&dev->mutex);
+	unlock_kernel();
 	kfree(buffer);
 	kfree(buffer);
 	return retval;
 	return retval;
 }
 }
@@ -719,7 +721,7 @@ static const struct file_operations iowarrior_fops = {
 	.owner = THIS_MODULE,
 	.owner = THIS_MODULE,
 	.write = iowarrior_write,
 	.write = iowarrior_write,
 	.read = iowarrior_read,
 	.read = iowarrior_read,
-	.ioctl = iowarrior_ioctl,
+	.unlocked_ioctl = iowarrior_ioctl,
 	.open = iowarrior_open,
 	.open = iowarrior_open,
 	.release = iowarrior_release,
 	.release = iowarrior_release,
 	.poll = iowarrior_poll,
 	.poll = iowarrior_poll,