[SCSI] enable destruction of blocked devices which fail LUN scanning
authorBart Van Assche <bvanassche@acm.org>
Tue, 2 Jul 2013 13:06:33 +0000 (15:06 +0200)
committerJames Bottomley <JBottomley@Parallels.com>
Tue, 9 Jul 2013 11:14:09 +0000 (12:14 +0100)
If something goes wrong during LUN scanning, e.g. a transport layer
failure occurs, then __scsi_remove_device() can get invoked by the
LUN scanning code for a SCSI device in state SDEV_CREATED_BLOCK and
before the SCSI device has been added to sysfs (is_visible == 0).
Make sure that even in this case the transition into state SDEV_DEL
occurs. This avoids that __scsi_remove_device() can get invoked a
second time by scsi_forget_host() if this last function is invoked
from another thread than the thread that performs LUN scanning.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/scsi_lib.c

index df8bd5ab3c0b51b76c3567b92731d21eca8f90f3..124392f3091ed7be8d04b370b375f82b3a677f0f 100644 (file)
@@ -2193,6 +2193,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
                case SDEV_OFFLINE:
                case SDEV_TRANSPORT_OFFLINE:
                case SDEV_CANCEL:
+               case SDEV_CREATED_BLOCK:
                        break;
                default:
                        goto illegal;