scsi: hpsa: correct logical volume removal

Suggested-by: Martin Wilck <mwilck@suse.com>
Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 228d74465fd0f2c8c887bdf756716d8bb2b9730a..a536ed620e6e1c8ea5f49b1000f4cfd87e6da450 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1882,6 +1882,12 @@ static void hpsa_remove_device(struct ctlr_info *h,
        if (!h->scsi_host)
                return;
 
+       /*
+        * Allow for commands to drain
+        */
+       device->removed = 1;
+       hpsa_wait_for_outstanding_commands_for_dev(h, device);
+
        if (is_logical_device(device)) { /* RAID */
                sdev = scsi_device_lookup(h->scsi_host, device->bus,
                                                device->target, device->lun);
@@ -1899,9 +1905,6 @@ static void hpsa_remove_device(struct ctlr_info *h,
                }
        } else { /* HBA */
 
-               device->removed = 1;
-               hpsa_wait_for_outstanding_commands_for_dev(h, device);
-
                hpsa_remove_sas_device(device);
        }
 }