From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bart Van Assche Subject: [PATCH v11 9/9] Avoid reenabling I/O after the transport became offline Date: Wed, 12 Jun 2013 14:58:48 +0200 Message-ID: <51B87088.9000102@acm.org> References: <51B86E26.6030108@acm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from gerard.telenet-ops.be ([195.130.132.48]:36641 "EHLO gerard.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751402Ab3FLM6v (ORCPT ); Wed, 12 Jun 2013 08:58:51 -0400 In-Reply-To: <51B86E26.6030108@acm.org> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: linux-scsi Cc: Joe Lawrence , Tejun Heo , Chanho Min , David Milburn , James Bottomley , Mike Christie , Hannes Reinecke Disallow the SDEV_TRANSPORT_OFFLINE to SDEV_CANCEL transition such that no I/O is sent to devices for which the transport is offline. Notes: - Functions like sd_shutdown() use scsi_execute_req() and hence set the REQ_PREEMPT flag. Such requests are passed to the LLD queuecommand callback in the SDEV_CANCEL state. - This patch does not affect Fibre Channel LLD drivers since these drivers invoke fc_remote_port_chkready() before submitting a SCSI request to the HBA. That prevents a timeout to occur in state SDEV_CANCEL if the transport is offline. Signed-off-by: Bart Van Assche Reviewed-by: Mike Christie Cc: James Bottomley Cc: Hannes Reinecke Cc: Tejun Heo --- drivers/scsi/scsi_lib.c | 1 - drivers/scsi/scsi_sysfs.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 10c054f..024e768 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2162,7 +2162,6 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) case SDEV_RUNNING: case SDEV_QUIESCE: case SDEV_OFFLINE: - case SDEV_TRANSPORT_OFFLINE: case SDEV_BLOCK: break; default: diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 11318cc..dd2005c 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -963,7 +963,8 @@ void __scsi_remove_device(struct scsi_device *sdev) if (sdev->is_visible) { spin_lock_irqsave(shost->host_lock, flags); - WARN(scsi_device_set_state(sdev, SDEV_CANCEL) != 0, + WARN(scsi_device_set_state(sdev, SDEV_CANCEL) != 0 && + sdev->sdev_state != SDEV_TRANSPORT_OFFLINE, "%s: unexpected state %d\n", dev_name(&sdev->sdev_gendev), sdev->sdev_state); spin_unlock_irqrestore(shost->host_lock, flags); -- 1.7.10.4