[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120525175140.22423.21697.stgit@dwillia2-linux.jf.intel.com>
Date: Fri, 25 May 2012 10:55:07 -0700
From: Dan Williams <dan.j.williams@...el.com>
To: JBottomley@...allels.com
Cc: Meelis Roos <mroos@...ux.ee>,
Alan Stern <stern@...land.harvard.edu>,
linux-kernel@...r.kernel.org, linux-scsi@...r.kernel.org,
David Miller <davem@...emloft.net>
Subject: [PATCH v2] scsi: fix async probe regression
Commit a7a20d1 "[SCSI] sd: limit the scope of the async probe domain"
moved sd probe work out of reach of wait_for_device_probe(). Allow it
to be synced via scsi_complete_async_scans().
Cc: David Miller <davem@...emloft.net>
Cc: Alan Stern <stern@...land.harvard.edu>
Reported-by: Meelis Roos <mroos@...ux.ee>
Tested-by: Meelis Roos <mroos@...ux.ee>
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
---
v2: James: don't wrapper scsi_complete_async_scans()
Kept the Tested-by tag since this is equivalent to v1.
--
Dan
drivers/scsi/scsi_scan.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 01b0374..2e5fe58 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists