From a471e7ffe6a1016c64204f5e8204ec7116ae6e39 Mon Sep 17 00:00:00 2001 From: Brian King Date: Tue, 27 Jun 2006 11:10:43 -0500 Subject: [PATCH] --- yaml --- r: 31913 b: refs/heads/master c: 309bd271211caa5a04a8137649cebd7691376351 h: refs/heads/master i: 31911: 24a63822870b31d1fbbcae398227500324c72033 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_lib.c | 3 +++ trunk/drivers/scsi/scsi_scan.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 233ff3adb891..2deacf76f540 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a144c5ae0956fb262e6c82624c82b1110a451437 +refs/heads/master: 309bd271211caa5a04a8137649cebd7691376351 diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c index 68e0d7dbe6ce..bf5191f6aaa1 100644 --- a/trunk/drivers/scsi/scsi_lib.c +++ b/trunk/drivers/scsi/scsi_lib.c @@ -2037,6 +2037,9 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) case SDEV_DEL: switch (oldstate) { + case SDEV_CREATED: + case SDEV_RUNNING: + case SDEV_OFFLINE: case SDEV_CANCEL: break; default: diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c index 0f7e6f94d66b..4c31799e2711 100644 --- a/trunk/drivers/scsi/scsi_scan.c +++ b/trunk/drivers/scsi/scsi_scan.c @@ -810,6 +810,7 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) static inline void scsi_destroy_sdev(struct scsi_device *sdev) { + scsi_device_set_state(sdev, SDEV_DEL); if (sdev->host->hostt->slave_destroy) sdev->host->hostt->slave_destroy(sdev); transport_destroy_device(&sdev->sdev_gendev);