Merge ../scsi-rc-fixes-2.6

Conflicts:

	include/scsi/scsi_devinfo.h

Same number for two BLIST flags:  BLIST_MAX_512 and BLIST_ATTACH_PQ3

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 7d31a4b0f802..5c7e51f9efed 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -673,6 +673,7 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
         case TYPE_MEDIUM_CHANGER:
         case TYPE_ENCLOSURE:
         case TYPE_COMM:
+        case TYPE_RAID:
         case TYPE_RBC:
                 sdev->writeable = 1;
                 break;
@@ -738,6 +739,13 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
                 sdev->select_no_atn = 1;
 
         /*
+         * Maximum 512 sector transfer length
+         * broken RA4x00 Compaq Disk Array
+         */
+        if (*bflags & BLIST_MAX_512)
+                blk_queue_max_sectors(sdev->request_queue, 512);
+
+        /*
          * Some devices may not want to have a start command automatically
          * issued when a device is added.
          */
@@ -1146,10 +1154,13 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
          * Also allow SCSI-2 if BLIST_REPORTLUN2 is set and host adapter does
          * support more than 8 LUNs.
          */
-        if ((bflags & BLIST_NOREPORTLUN) || 
-             starget->scsi_level < SCSI_2 ||
-            (starget->scsi_level < SCSI_3 && 
-             (!(bflags & BLIST_REPORTLUN2) || shost->max_lun <= 8)) )
+        if (bflags & BLIST_NOREPORTLUN)
+                return 1;
+        if (starget->scsi_level < SCSI_2 &&
+            starget->scsi_level != SCSI_UNKNOWN)
+                return 1;
+        if (starget->scsi_level < SCSI_3 &&
+            (!(bflags & BLIST_REPORTLUN2) || shost->max_lun <= 8))
                 return 1;
         if (bflags & BLIST_NOLUN)
                 return 0;