[SCSI] libsas: Destroy the task collector thread after releasing ports

If we use task collector mode, we can end up destroying the task collector
thread before we release the ports, which is bad if a port release causes
a disk I/O (such as cache flushing).

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 90cce34cb6f5..4df73d69bb3c 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -127,12 +127,13 @@ Undo_phys:
 
 int sas_unregister_ha(struct sas_ha_struct *sas_ha)
 {
+        sas_unregister_ports(sas_ha);
+
         if (sas_ha->lldd_max_execute_num > 1) {
                 sas_shutdown_queue(sas_ha);
+                sas_ha->lldd_max_execute_num = 1;
         }
 
-        sas_unregister_ports(sas_ha);
-
         return 0;
 }