From: Bart Van Assche <bvanassche@acm.org>
To: James Bottomley <jbottomley@parallels.com>
Cc: Mike Christie <michaelc@cs.wisc.edu>,
Hannes Reinecke <hare@suse.de>, Chanho Min <chanho.min@lge.com>,
Joe Lawrence <jdl1291@gmail.com>,
linux-scsi <linux-scsi@vger.kernel.org>,
David Milburn <dmilburn@redhat.com>, Tejun Heo <tj@kernel.org>
Subject: [PATCH 4/4] Disallow changing the device state via sysfs into "deleted"
Date: Tue, 02 Jul 2013 15:08:08 +0200 [thread overview]
Message-ID: <51D2D0B8.9010207@acm.org> (raw)
In-Reply-To: <51D2CFE2.90302@acm.org>
Changing the state of a SCSI device via sysfs into "cancel" or
"deleted" prevents removal of these devices by scsi_remove_host().
Hence do not allow this.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: James Bottomley <JBottomley@Parallels.com>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Hannes Reinecke <hare@suse.de>
Cc: David Milburn <dmilburn@redhat.com>
---
drivers/scsi/scsi_sysfs.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 1711617..292df85 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -605,10 +605,8 @@ 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_DEL ||
+ scsi_device_set_state(sdev, state))
return -EINVAL;
return count;
}
--
1.7.10.4
prev parent reply other threads:[~2013-07-02 13:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-02 13:04 [PATCH v13 0/4] SCSI device removal fixes Bart Van Assche
2013-07-02 13:05 ` [PATCH 1/4] Fix race between starved list and device removal Bart Van Assche
2013-07-02 13:06 ` [PATCH 2/4] Avoid calling __scsi_remove_device() twice Bart Van Assche
2013-07-02 13:07 ` [PATCH 3/4] Avoid re-enabling I/O after the transport became offline Bart Van Assche
2013-07-02 13:44 ` James Bottomley
2013-07-02 13:08 ` Bart Van Assche [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51D2D0B8.9010207@acm.org \
--to=bvanassche@acm.org \
--cc=chanho.min@lge.com \
--cc=dmilburn@redhat.com \
--cc=hare@suse.de \
--cc=jbottomley@parallels.com \
--cc=jdl1291@gmail.com \
--cc=linux-scsi@vger.kernel.org \
--cc=michaelc@cs.wisc.edu \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox