]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] SCSI core: Allow QUIESCE -> CANCEL sdev transition
authorAlan Stern <stern@rowland.harvard.edu>
Fri, 23 Jun 2006 18:25:34 +0000 (14:25 -0400)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 26 Jun 2006 15:00:52 +0000 (10:00 -0500)
We have to be able to remove SCSI devices even when they are suspended, so
QUIESCE -> CANCEL must be a legal state transition.  This patch (as727)
adds the transition to the state machine.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/scsi_lib.c

index 4c4add53d69b27a377e3909cc059d290441bc297..68e0d7dbe6ce608956159dcbac67b38135de03b4 100644 (file)
@@ -2026,6 +2026,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
                switch (oldstate) {
                case SDEV_CREATED:
                case SDEV_RUNNING:
+               case SDEV_QUIESCE:
                case SDEV_OFFLINE:
                case SDEV_BLOCK:
                        break;