On Sat, Dec 21, 2013 at 03:51:25PM -0500, Alan Stern wrote:
> On Fri, 20 Dec 2013, Sarah Sharp wrote:
>
> > On Thu, Dec 19, 2013 at 11:48:47AM -0800, James Bottomley wrote:
> > > It should apply incrementally on top of the previous two. If it
> > > actually works, I'll fold it into the first patch.
> >
> > Well, it doesn't oops anymore, but it does generate a pile of warnings:
>
> This was a simple oversight. scsi_target_reap() was called at the
> start of __scsi_remove_device(), but it should be called at the end.
> The patch below, applied on top of James's three patches, will fix the
> warnings.
>
> Alan Stern
>
> P.S.: The comment isn't entirely correct any more...
Ok, Alan's additional patch fixed the warnings I was seeing on UAS
device unplug. James, can you Cc me on the finished patch when you send
it in?
Hans, I don't want to send the UAS patches off to Greg until James'
patches get into mainline. I believe Greg's usb-next tree is frozen at
this point, so they'll have to wait until 3.15.
Sarah Sharp
> Index: usb-3.13/drivers/scsi/scsi_sysfs.c
> ===================================================================
> --- usb-3.13.orig/drivers/scsi/scsi_sysfs.c
> +++ usb-3.13/drivers/scsi/scsi_sysfs.c
> @@ -1028,13 +1028,6 @@ void __scsi_remove_device(struct scsi_de
> {
> struct device *dev = &sdev->sdev_gendev;
>
> - /*
> - * Paired with the kref_get() in scsi_sysfs_initialize(). We're
> - * removing sysfs visibility from the device, so make the target
> - * invisible if this was the last device underneath it.
> - */
> - scsi_target_reap(scsi_target(sdev));
> -
> if (sdev->is_visible) {
> if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0)
> return;
> @@ -1059,6 +1052,13 @@ void __scsi_remove_device(struct scsi_de
> sdev->host->hostt->slave_destroy(sdev);
> transport_destroy_device(dev);
>
> + /*
> + * Paired with the kref_get() in scsi_sysfs_initialize(). We're
> + * removing sysfs visibility from the device, so make the target
> + * invisible if this was the last device underneath it.
> + */
> + scsi_target_reap(scsi_target(sdev));
> +
> put_device(dev);
> }
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
