scsi_dh: don't try to load a device handler during async probing

Request_module gets really unhappy when called from async probing, so
revert to not auto load device handler modules during the SCSI bus
scan.  While autoloading would be really useful we never did this
until 4.3-rc and it turns out that functionality doesn't actually
work.

Fixes: 566079 ("dm-mpath, scsi_dh: request scsi_dh modules in scsi_dh, not dm-mpath")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Paul Mackerras <paulus@ozlabs.org>
Tested-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/scsi_dh.c b/drivers/scsi/scsi_dh.c
index cb78388de3fc5bc0876144f87c6e1378bc1204f7..e7649ed3f6677e69fe2e3644da24d99de2aa3181 100644 (file)
--- a/drivers/scsi/scsi_dh.c
+++ b/drivers/scsi/scsi_dh.c
@@ -226,7 +226,7 @@ int scsi_dh_add_device(struct scsi_device *sdev)
 
        drv = scsi_dh_find_driver(sdev);
        if (drv)
 
        drv = scsi_dh_find_driver(sdev);
        if (drv)

-               devinfo = scsi_dh_lookup(drv);
+               devinfo = __scsi_dh_lookup(drv);

        if (devinfo)
                err = scsi_dh_handler_attach(sdev, devinfo);
        return err;
        if (devinfo)
                err = scsi_dh_handler_attach(sdev, devinfo);
        return err;