From 1ce13506da6e4c04e8279be83192ff4846107ae1 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 24 Aug 2011 10:51:17 +0200 Subject: [PATCH] --- yaml --- r: 271035 b: refs/heads/master c: 6bc8d2a0c6bb3e52f0c66e6cde6799d1b90b42ba h: refs/heads/master i: 271033: a188bab9fbc1d7fbdb4eb08d7e82fe5cd625e6a4 271031: 4f686b4f315bd28f45b8e1479b81109ae25de308 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/device_handler/scsi_dh.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea71618c08ad..f730dd2908e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46ccf6b55bfa9fff7d0a9da761f186e98cf2f660 +refs/heads/master: 6bc8d2a0c6bb3e52f0c66e6cde6799d1b90b42ba diff --git a/trunk/drivers/scsi/device_handler/scsi_dh.c b/trunk/drivers/scsi/device_handler/scsi_dh.c index 3ac71cf6b7f0..7c05fd9dccfd 100644 --- a/trunk/drivers/scsi/device_handler/scsi_dh.c +++ b/trunk/drivers/scsi/device_handler/scsi_dh.c @@ -190,6 +190,10 @@ store_dh_state(struct device *dev, struct device_attribute *attr, struct scsi_device_handler *scsi_dh; int err = -EINVAL; + if (sdev->sdev_state == SDEV_CANCEL || + sdev->sdev_state == SDEV_DEL) + return -ENODEV; + if (!sdev->scsi_dh_data) { /* * Attach to a device handler