summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2009-01-27 11:41:36 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-02-10 11:15:17 -0500
commitc2f9e49f9bbfa2e111ab1e1628b96b560bae7cec (patch)
tree8a0d0332d213eae45c165b4aed689a45585a48d8 /drivers/scsi/scsi_scan.c
parente637d553199e264327714da437e6c808f2f4b096 (diff)
downloadop-kernel-dev-c2f9e49f9bbfa2e111ab1e1628b96b560bae7cec.zip
op-kernel-dev-c2f9e49f9bbfa2e111ab1e1628b96b560bae7cec.tar.gz
[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>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 66505bb..8f4de20 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:
OpenPOWER on IntegriCloud