From f7fc15331c3fbe3f55d03960a56894e6ec142a00 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Thu, 12 Jan 2012 11:47:24 -0800
Subject: [PATCH] --- yaml --- r: 293020 b: refs/heads/master c:
 5d7f6d1071eadd020edb2cf366d358e0f6d0a0f9 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/scsi/libsas/sas_event.c    | 19 +++++++++++++------
 trunk/drivers/scsi/libsas/sas_init.c     | 18 +++++++++++-------
 trunk/drivers/scsi/libsas/sas_internal.h |  1 +
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 01bd0be635e6..5040e2bad4e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab5266335ba1a43461443f9823276a2b44dd1ba7
+refs/heads/master: 5d7f6d1071eadd020edb2cf366d358e0f6d0a0f9
diff --git a/trunk/drivers/scsi/libsas/sas_event.c b/trunk/drivers/scsi/libsas/sas_event.c
index dbfaceeea0f7..16639bbae629 100644
--- a/trunk/drivers/scsi/libsas/sas_event.c
+++ b/trunk/drivers/scsi/libsas/sas_event.c
@@ -51,15 +51,11 @@ static void sas_queue_event(int event, unsigned long *pending,
 	}
 }
 
-int sas_drain_work(struct sas_ha_struct *ha)
+
+void __sas_drain_work(struct sas_ha_struct *ha)
 {
 	struct workqueue_struct *wq = ha->core.shost->work_q;
 	struct work_struct *w, *_w;
-	int err;
-
-	err = mutex_lock_interruptible(&ha->drain_mutex);
-	if (err)
-		return err;
 
 	set_bit(SAS_HA_DRAINING, &ha->state);
 	/* flush submitters */
@@ -75,6 +71,17 @@ int sas_drain_work(struct sas_ha_struct *ha)
 		sas_queue_work(ha, w);
 	}
 	spin_unlock_irq(&ha->state_lock);
+}
+
+int sas_drain_work(struct sas_ha_struct *ha)
+{
+	int err;
+
+	err = mutex_lock_interruptible(&ha->drain_mutex);
+	if (err)
+		return err;
+	if (test_bit(SAS_HA_REGISTERED, &ha->state))
+		__sas_drain_work(ha);
 	mutex_unlock(&ha->drain_mutex);
 
 	return 0;
diff --git a/trunk/drivers/scsi/libsas/sas_init.c b/trunk/drivers/scsi/libsas/sas_init.c
index dc93e1181469..09c14ca3fbd5 100644
--- a/trunk/drivers/scsi/libsas/sas_init.c
+++ b/trunk/drivers/scsi/libsas/sas_init.c
@@ -160,18 +160,22 @@ int sas_register_ha(struct sas_ha_struct *sas_ha)
 
 int sas_unregister_ha(struct sas_ha_struct *sas_ha)
 {
-	unsigned long flags;
-
 	/* Set the state to unregistered to avoid further unchained
-	 * events to be queued
+	 * events to be queued, and flush any in-progress drainers
 	 */
-	spin_lock_irqsave(&sas_ha->state_lock, flags);
+	mutex_lock(&sas_ha->drain_mutex);
+	spin_lock_irq(&sas_ha->state_lock);
 	clear_bit(SAS_HA_REGISTERED, &sas_ha->state);
-	spin_unlock_irqrestore(&sas_ha->state_lock, flags);
-	sas_drain_work(sas_ha);
+	spin_unlock_irq(&sas_ha->state_lock);
+	__sas_drain_work(sas_ha);
+	mutex_unlock(&sas_ha->drain_mutex);
 
 	sas_unregister_ports(sas_ha);
-	sas_drain_work(sas_ha);
+
+	/* flush unregistration work */
+	mutex_lock(&sas_ha->drain_mutex);
+	__sas_drain_work(sas_ha);
+	mutex_unlock(&sas_ha->drain_mutex);
 
 	if (sas_ha->lldd_max_execute_num > 1) {
 		sas_shutdown_queue(sas_ha);
diff --git a/trunk/drivers/scsi/libsas/sas_internal.h b/trunk/drivers/scsi/libsas/sas_internal.h
index 4157f6e1eda2..7818c4673c3a 100644
--- a/trunk/drivers/scsi/libsas/sas_internal.h
+++ b/trunk/drivers/scsi/libsas/sas_internal.h
@@ -70,6 +70,7 @@ int  sas_init_events(struct sas_ha_struct *sas_ha);
 void sas_shutdown_queue(struct sas_ha_struct *sas_ha);
 void sas_disable_revalidation(struct sas_ha_struct *ha);
 void sas_enable_revalidation(struct sas_ha_struct *ha);
+void __sas_drain_work(struct sas_ha_struct *ha);
 
 void sas_deform_port(struct asd_sas_phy *phy, int gone);