summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2012-07-09 19:33:45 -0700
committerJames Bottomley <JBottomley@Parallels.com>2012-07-20 09:25:56 +0100
commite96eb23d82b4246cce4eeb14a7eedbbdcf37b3d4 (patch)
tree303ade8a4425514d36b84a00aa8742117e622d2a
parent492d542273a4859f8bf8cc7744cdf71ef50b39ea (diff)
downloadop-kernel-dev-e96eb23d82b4246cce4eeb14a7eedbbdcf37b3d4.zip
op-kernel-dev-e96eb23d82b4246cce4eeb14a7eedbbdcf37b3d4.tar.gz
[SCSI] Revert "[SCSI] fix async probe regression"
This reverts commit 43a8d39d0137612c336aa8bbb2cb886a79772ffb. Commit 43a8d39d fixed the fact that wait_for_device_probe() was unable to flush sd probe work. Now that sd probe work is once again flushable via wait_for_device_probe() this workaround is no longer needed. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Tested-by: Eldad Zack <eldad@fogrefinery.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/scsi_scan.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index a0bc663..56a9379 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))
- goto out;
+ return 0;
/* 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,11 +179,8 @@ int scsi_complete_async_scans(void)
}
done:
spin_unlock(&async_scan_lock);
- kfree(data);
-
- out:
- async_synchronize_full_domain(&scsi_sd_probe_domain);
+ kfree(data);
return 0;
}
OpenPOWER on IntegriCloud