Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[~andy/linux] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5ba5c2a9e8e987ffe95da22a179d42b18590570e..6f0a4c612b3bf0f60a952d080033f98f1b2b4cff 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -65,6 +65,7 @@
 #include <scsi/scsicam.h>
 
 #include "sd.h"
+#include "scsi_priv.h"
 #include "scsi_logging.h"
 
 MODULE_AUTHOR("Eric Youngdale");
@@ -2722,7 +2723,7 @@ static int sd_probe(struct device *dev)
        dev_set_drvdata(dev, sdkp);
 
        get_device(&sdkp->dev); /* prevent release before async_schedule */
-       async_schedule(sd_probe_async, sdkp);
+       async_schedule_domain(sd_probe_async, sdkp, &scsi_sd_probe_domain);
 
        return 0;
 
@@ -2756,7 +2757,7 @@ static int sd_remove(struct device *dev)
        sdkp = dev_get_drvdata(dev);
        scsi_autopm_get_device(sdkp->device);
 
-       async_synchronize_full();
+       async_synchronize_full_domain(&scsi_sd_probe_domain);
        blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn);
        blk_queue_unprep_rq(sdkp->device->request_queue, NULL);
        device_del(&sdkp->dev);