1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 56675dbbf681..ba3f1e8d0d57 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -736,6 +736,16 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
                 sdev->scsi_level++;
         sdev->sdev_target->scsi_level = sdev->scsi_level;
 
+        /*
+         * If SCSI-2 or lower, and if the transport requires it,
+         * store the LUN value in CDB[1].
+         */
+        sdev->lun_in_cdb = 0;
+        if (sdev->scsi_level <= SCSI_2 &&
+            sdev->scsi_level != SCSI_UNKNOWN &&
+            !sdev->host->no_scsi2_lun_in_cdb)
+                sdev->lun_in_cdb = 1;
+
         return 0;
 }
 
@@ -805,6 +815,19 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
         } else {
                 sdev->type = (inq_result[0] & 0x1f);
                 sdev->removable = (inq_result[1] & 0x80) >> 7;
+
+                /*
+                 * some devices may respond with wrong type for
+                 * well-known logical units. Force well-known type
+                 * to enumerate them correctly.
+                 */
+                if (scsi_is_wlun(sdev->lun) && sdev->type != TYPE_WLUN) {
+                        sdev_printk(KERN_WARNING, sdev,
+                                "%s: correcting incorrect peripheral device type 0x%x for W-LUN 0x%16xhN\n",
+                                __func__, sdev->type, (unsigned int)sdev->lun);
+                        sdev->type = TYPE_WLUN;
+                }
+
         }
 
         if (sdev->type == TYPE_RBC || sdev->type == TYPE_ROM) {
@@ -1733,6 +1756,9 @@ static void scsi_sysfs_add_devices(struct Scsi_Host *shost)
                 /* target removed before the device could be added */
                 if (sdev->sdev_state == SDEV_DEL)
                         continue;
+                /* If device is already visible, skip adding it to sysfs */
+                if (sdev->is_visible)
+                        continue;
                 if (!scsi_host_scan_allowed(shost) ||
                     scsi_sysfs_add_sdev(sdev) != 0)
                         __scsi_remove_device(sdev);