1 files changed, 59 insertions, 29 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 19c9a232a754..b86f170fa8ed 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -870,8 +870,12 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
  out_free_sdev:
         if (res == SCSI_SCAN_LUN_PRESENT) {
                 if (sdevp) {
-                        scsi_device_get(sdev);
-                        *sdevp = sdev;
+                        if (scsi_device_get(sdev) == 0) {
+                                *sdevp = sdev;
+                        } else {
+                                __scsi_remove_device(sdev);
+                                res = SCSI_SCAN_NO_RESPONSE;
+                        }
                 }
         } else {
                 if (sdev->host->hostt->slave_destroy)
@@ -1260,6 +1264,19 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
 }
 EXPORT_SYMBOL(__scsi_add_device);
 
+int scsi_add_device(struct Scsi_Host *host, uint channel,
+                    uint target, uint lun)
+{
+        struct scsi_device *sdev = 
+                __scsi_add_device(host, channel, target, lun, NULL);
+        if (IS_ERR(sdev))
+                return PTR_ERR(sdev);
+
+        scsi_device_put(sdev);
+        return 0;
+}
+EXPORT_SYMBOL(scsi_add_device);
+
 void scsi_rescan_device(struct device *dev)
 {
         struct scsi_driver *drv;
@@ -1276,27 +1293,8 @@ void scsi_rescan_device(struct device *dev)
 }
 EXPORT_SYMBOL(scsi_rescan_device);
 
-/**
- * scsi_scan_target - scan a target id, possibly including all LUNs on the
- *     target.
- * @sdevsca:    Scsi_Device handle for scanning
- * @shost:      host to scan
- * @channel:    channel to scan
- * @id:         target id to scan
- *
- * Description:
- *     Scan the target id on @shost, @channel, and @id. Scan at least LUN
- *     0, and possibly all LUNs on the target id.
- *
- *     Use the pre-allocated @sdevscan as a handle for the scanning. This
- *     function sets sdevscan->host, sdevscan->id and sdevscan->lun; the
- *     scanning functions modify sdevscan->lun.
- *
- *     First try a REPORT LUN scan, if that does not scan the target, do a
- *     sequential scan of LUNs on the target id.
- **/
-void scsi_scan_target(struct device *parent, unsigned int channel,
-                      unsigned int id, unsigned int lun, int rescan)
+static void __scsi_scan_target(struct device *parent, unsigned int channel,
+                unsigned int id, unsigned int lun, int rescan)
 {
         struct Scsi_Host *shost = dev_to_shost(parent);
         int bflags = 0;
@@ -1310,9 +1308,7 @@ void scsi_scan_target(struct device *parent, unsigned int channel,
                  */
                 return;
 
-
         starget = scsi_alloc_target(parent, channel, id);
-
         if (!starget)
                 return;
 
@@ -1358,6 +1354,33 @@ void scsi_scan_target(struct device *parent, unsigned int channel,
 
         put_device(&starget->dev);
 }
+
+/**
+ * scsi_scan_target - scan a target id, possibly including all LUNs on the
+ *     target.
+ * @parent:     host to scan
+ * @channel:    channel to scan
+ * @id:         target id to scan
+ * @lun:        Specific LUN to scan or SCAN_WILD_CARD
+ * @rescan:     passed to LUN scanning routines
+ *
+ * Description:
+ *     Scan the target id on @parent, @channel, and @id. Scan at least LUN 0,
+ *     and possibly all LUNs on the target id.
+ *
+ *     First try a REPORT LUN scan, if that does not scan the target, do a
+ *     sequential scan of LUNs on the target id.
+ **/
+void scsi_scan_target(struct device *parent, unsigned int channel,
+                      unsigned int id, unsigned int lun, int rescan)
+{
+        struct Scsi_Host *shost = dev_to_shost(parent);
+
+        down(&shost->scan_mutex);
+        if (scsi_host_scan_allowed(shost))
+                __scsi_scan_target(parent, channel, id, lun, rescan);
+        up(&shost->scan_mutex);
+}
 EXPORT_SYMBOL(scsi_scan_target);
 
 static void scsi_scan_channel(struct Scsi_Host *shost, unsigned int channel,
@@ -1383,10 +1406,12 @@ static void scsi_scan_channel(struct Scsi_Host *shost, unsigned int channel,
                                 order_id = shost->max_id - id - 1;
                         else
                                 order_id = id;
-                        scsi_scan_target(&shost->shost_gendev, channel, order_id, lun, rescan);
+                        __scsi_scan_target(&shost->shost_gendev, channel,
+                                        order_id, lun, rescan);
                 }
         else
-                scsi_scan_target(&shost->shost_gendev, channel, id, lun, rescan);
+                __scsi_scan_target(&shost->shost_gendev, channel,
+                                id, lun, rescan);
 }
 
 int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
@@ -1484,12 +1509,15 @@ void scsi_forget_host(struct Scsi_Host *shost)
  */
 struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
 {
-        struct scsi_device *sdev;
+        struct scsi_device *sdev = NULL;
         struct scsi_target *starget;
 
+        down(&shost->scan_mutex);
+        if (!scsi_host_scan_allowed(shost))
+                goto out;
         starget = scsi_alloc_target(&shost->shost_gendev, 0, shost->this_id);
         if (!starget)
-                return NULL;
+                goto out;
 
         sdev = scsi_alloc_sdev(starget, 0, NULL);
         if (sdev) {
@@ -1497,6 +1525,8 @@ struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
                 sdev->borken = 0;
         }
         put_device(&starget->dev);
+ out:
+        up(&shost->scan_mutex);
         return sdev;
 }
 EXPORT_SYMBOL(scsi_get_host_dev);