Skip to content

Commit e96eb23

Browse files
djbwJames Bottomley
authored andcommitted
[SCSI] Revert "[SCSI] fix async probe regression"
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>
1 parent 492d542 commit e96eb23

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/scsi/scsi_scan.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ int scsi_complete_async_scans(void)
147147

148148
do {
149149
if (list_empty(&scanning_hosts))
150-
goto out;
150+
return 0;
151151
/* If we can't get memory immediately, that's OK. Just
152152
* sleep a little. Even if we never get memory, the async
153153
* scans will finish eventually.
@@ -179,11 +179,8 @@ int scsi_complete_async_scans(void)
179179
}
180180
done:
181181
spin_unlock(&async_scan_lock);
182-
kfree(data);
183-
184-
out:
185-
async_synchronize_full_domain(&scsi_sd_probe_domain);
186182

183+
kfree(data);
187184
return 0;
188185
}
189186

0 commit comments

Comments
 (0)