linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	David Milburn <dmilburn@redhat.com>,
	linux-scsi <linux-scsi@vger.kernel.org>
Subject: [PATCH 4/7] Disallow changing the device state via sysfs into "deleted"
Date: Tue, 20 Aug 2013 14:08:39 +0200	[thread overview]
Message-ID: <52135C47.4090106@acm.org> (raw)
In-Reply-To: <52135B99.2000102@acm.org>

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 <bvanassche@acm.org>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Hannes Reinecke <hare@suse.de>
Cc: David Milburn <dmilburn@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 9a5cde9..c6276ec 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -635,10 +635,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


  parent reply	other threads:[~2013-08-20 12:08 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-20 12:05 SCSI core patches for kernel 3.12 Bart Van Assche
2013-08-20 12:06 ` [PATCH 1/7] Introduce scsi_device_being_removed() Bart Van Assche
2013-09-01 16:43   ` Christoph Hellwig
2013-08-20 12:07 ` [PATCH 2/7] Rework scsi_internal_device_unblock() Bart Van Assche
2013-09-01 16:44   ` Christoph Hellwig
2013-08-20 12:08 ` [PATCH 3/7] Avoid re-enabling I/O after the transport became offline Bart Van Assche
2013-09-01 16:46   ` Christoph Hellwig
2013-08-20 12:08 ` Bart Van Assche [this message]
2013-09-01 16:49   ` [PATCH 4/7] Disallow changing the device state via sysfs into "deleted" Christoph Hellwig
2013-09-02 18:59     ` Bart Van Assche
2013-09-02 19:06       ` Christoph Hellwig
2013-09-02 19:12         ` Bart Van Assche
2013-09-02 19:17           ` Christoph Hellwig
2013-08-20 12:09 ` [PATCH 5/7] Micro-optimize scsi_request_fn() Bart Van Assche
2013-09-01 16:50   ` Christoph Hellwig
2013-08-20 12:09 ` [PATCH 6/7] Rename scsi_get_command() and scsi_put_command() Bart Van Assche
2013-08-20 12:10 ` [PATCH 7/7] Micro-optimize scsi_next_command() Bart Van Assche
2013-09-01 17:06   ` Christoph Hellwig
2013-09-01 17:08     ` [PATCH 8/7] scsi: cleanup scsi_requeue_command Christoph Hellwig
2013-08-20 16:11 ` SCSI core patches for kernel 3.12 Nicholas A. Bellinger
2013-08-20 16:15   ` Bart Van Assche
2013-08-20 17:04     ` Nicholas A. Bellinger
2013-08-20 18:00       ` Bart Van Assche
2013-08-20 20:38         ` Nicholas A. Bellinger
2013-08-21  6:48           ` Christoph Hellwig
2013-08-21  7:35             ` Nicholas A. Bellinger
2013-10-02  7:40 ` Christoph Hellwig
2013-10-02 15:15   ` James Bottomley
2013-10-02 16:17     ` Christoph Hellwig

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=52135C47.4090106@acm.org \
    --to=bvanassche@acm.org \
    --cc=dmilburn@redhat.com \
    --cc=hare@suse.de \
    --cc=jbottomley@parallels.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=michaelc@cs.wisc.edu \
    /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;
as well as URLs for NNTP newsgroup(s).