Skip to content

Commit

Permalink
[SCSI] Revert "[SCSI] fix async probe regression"
Browse files Browse the repository at this point in the history
This reverts commit 43a8d39.

Commit 43a8d39 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>
  • Loading branch information
Dan Williams authored and James Bottomley committed Jul 20, 2012
1 parent 492d542 commit e96eb23
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/scsi/scsi_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit e96eb23

Please sign in to comment.