usblp BKL removal
Subsystems (2)
Pete Zaitcev
maintainerHello, Vojtech,
the appended patch is not in yet, what gives? I sent it to Marcelo with an understanding that it would be in Linus tree any day now. It was a couple of months ago. It's not just BKL witchhunt either. I remember that it fixed an oops, although I do not remember the precise scenario by now (it had something to do with a race between ->release and ->disconnect).
-- Pete
drivers/usb/class/usblp.c +8 -8
@@ -222,6 +222,7 @@/* forward reference to make our lives easier */ static struct usb_driver usblp_driver; +static DECLARE_MUTEX (usblp_sem);/* locks the existence of usblp's */ /* * Functions for usblp control messages.
@@ -343,7 +344,7 @@if (minor <0 )return -ENODEV ; -lock_kernel (); +down (&usblp_sem); retval = -ENODEV ; intf =usb_find_interface (&usblp_driver, minor);
@@ -389,7 +390,7 @@ } } out: -unlock_kernel (); +up (&usblp_sem);return retval; }
@@ -415,13 +416,13 @@ {struct usblp *usblp = file->private_data; -down (&usblp->sem); +down (&usblp_sem); usblp->used =0 ;if (usblp->present) {usblp_unlink_urbs (usblp); -up (&usblp->sem); }else /* finish cleanup from disconnect */ usblp_cleanup (usblp); +up (&usblp_sem);return 0 ; }
@@ -1149,8 +1150,8 @@BUG (); } +down (&usblp_sem);down (&usblp->sem); -lock_kernel (); usblp->present =0 ;usb_set_intfdata (intf,NULL );
@@ -1159,12 +1160,11 @@ usblp->writebuf, usblp->writeurb->transfer_dma);usb_buffer_free (usblp->dev,USBLP_BUF_SIZE , usblp->readbuf, usblp->readurb->transfer_dma); +up (&usblp->sem);if (!usblp->used)usblp_cleanup (usblp); -else /* cleanup later, on release */ -up (&usblp->sem); -unlock_kernel (); +up (&usblp_sem); }static struct usb_device_id usblp_ids [] = {
Greg KH
AppliedQuoted 7 lines · Pete Zaitcev
Hello, Vojtech,
the appended patch is not in yet, what gives? I sent it to Marcelo with an understanding that it would be in Linus tree any day now. It was a couple of months ago. It's not just BKL witchhunt either. I remember that it fixed an oops, although I do not remember the precise scenario by now (it had something to do with a race between ->release and ->disconnect).
Applied, thanks.
greg k-h