Changing the state of a SCSI device via sysfs into "cancel",
"cancel-offline" or "deleted" prevents removal of these devices by
scsi_remove_host(). Hence do not allow this.

Signed-off-by: Bart Van Assche <bvanass...@acm.org>
Cc: James Bottomley <jbottom...@parallels.com>
Cc: Mike Christie <micha...@cs.wisc.edu>
Cc: Hannes Reinecke <h...@suse.de>
Cc: David Milburn <dmilb...@redhat.com>
---
 drivers/scsi/scsi_sysfs.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index f6ce38e..f9db9c7 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -606,10 +606,9 @@ store_state_field(struct device *dev, struct 
device_attribute *attr,
                        break;
                }
        }
-       if (!state)
-               return -EINVAL;
-
-       if (scsi_device_set_state(sdev, state))
+       if (state == 0 || state == SDEV_CANCEL ||
+           state == SDEV_CANCEL_OFFLINE || state == SDEV_DEL ||
+           scsi_device_set_state(sdev, state) != 0)
                return -EINVAL;
        return count;
 }
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to