From a9e9a2677d95bbcafe828494b8e1eeb92f2c0293 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 25 May 2012 10:55:07 -0700
Subject: [PATCH] --- yaml --- r: 309663 b: refs/heads/master c:
 43a8d39d0137612c336aa8bbb2cb886a79772ffb h: refs/heads/master i:   309661:
 04322fdd0204e83c7efb3c79a065b1b20ee678be   309659:
 3d9137363cbd8adb686fcf35f8b4b2fc03e60955   309655:
 af8d126e11d13c7fc05bfd2a78b032e056d2876d   309647:
 09ebd3cba280f2ed5cbd9a6d25b63d7da53dbc03   309631:
 2b728b35f429d107d788d7524fc271881264ded5 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/scsi_scan.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 571bf7bf3311..7a0b3600b047 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b83d543fd934d565fb243ef348b06a61d794b31d
+refs/heads/master: 43a8d39d0137612c336aa8bbb2cb886a79772ffb
diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c
index 01b03744f1f9..2e5fe584aad3 100644
--- a/trunk/drivers/scsi/scsi_scan.c
+++ b/trunk/drivers/scsi/scsi_scan.c
@@ -147,7 +147,7 @@ int scsi_complete_async_scans(void)
 
 	do {
 		if (list_empty(&scanning_hosts))
-			return 0;
+			goto out;
 		/* If we can't get memory immediately, that's OK.  Just
 		 * sleep a little.  Even if we never get memory, the async
 		 * scans will finish eventually.
@@ -179,8 +179,11 @@ int scsi_complete_async_scans(void)
 	}
  done:
 	spin_unlock(&async_scan_lock);
-
 	kfree(data);
+
+ out:
+	async_synchronize_full_domain(&scsi_sd_probe_domain);
+
 	return 0;
 }