diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-05-25 10:55:07 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-30 13:37:07 +0400 |
| commit | 43a8d39d0137612c336aa8bbb2cb886a79772ffb (patch) | |
| tree | 3e11f09edb70fd9dad771c452806524c63ff41dc /drivers/scsi/scsi_scan.c | |
| parent | b83d543fd934d565fb243ef348b06a61d794b31d (diff) | |
| download | linux-43a8d39d0137612c336aa8bbb2cb886a79772ffb.tar.gz linux-43a8d39d0137612c336aa8bbb2cb886a79772ffb.tar.bz2 linux-43a8d39d0137612c336aa8bbb2cb886a79772ffb.zip | |
[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().
Reported-by: Meelis Roos <mroos@linux.ee>
Tested-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 01b03744f1f9..2e5fe584aad3 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; } |