From: James Smart <James.Smart@Emulex.Com>
Date: Tue, 27 Jan 2009 16:41:36 +0000 (-0500)
Subject: [SCSI] scsi_scan: add missing interim SDEV_DEL state if slave_alloc fails
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c2f9e49f9bbfa2e111ab1e1628b96b560bae7cec;p=linux.git

[SCSI] scsi_scan: add missing interim SDEV_DEL state if slave_alloc fails

We were running i/o and performing a bunch of hba resets in a loop.
This forces a lot of target removes and then rescans. Since the
resets are occuring during scan it's causing the scan i/o to timeout,
invoking error recovery, etc.  We end up getting some nasty crashing
in scsi_scan.c due to references to old sdevs that are failing
but had some lingering references that kept them around.

Fix by setting device state to SDEV_DEL if the LLD's slave_alloc
fails.

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 66505bb794100..8f4de20c9deb0 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -317,6 +317,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
 	return sdev;
 
 out_device_destroy:
+	scsi_device_set_state(sdev, SDEV_DEL);
 	transport_destroy_device(&sdev->sdev_gendev);
 	put_device(&sdev->sdev_gendev);
 out: