[PATCH] Updated scsi patch

scsi_syms.c:
  Missing export
drivers/scsi/aic7xxx_old.c:
   More updates for the slave_attach stuff
drivers/scsi/scsi_scan.c:
   Make scsi_scan.c call hostt->slave_attach after we have set the
   sdev->tagged_supported variable

drivers/scsi/aic7xxx_old.c

@@ -6981,9 +6981,9 @@ aic7xxx_device_queue_depth(struct aic7xxx_host *p, Scsi_Device *device)
     if(device->tagged_supported) {
       if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
       {
-        printk(INFO_LEAD "Enabled tagged queuing, queue depth %d.\n",
+        printk(INFO_LEAD "Enabled tagged queuing on secondary lun, queue depth +%d.\n",
                p->host_no, device->channel, device->id,
-               device->lun, device->queue_depth);
+               device->lun, p->dev_lun_queue_depth[tindex]);
       }
       p->dev_max_queue_depth[tindex] += p->dev_lun_queue_depth[tindex];
       p->dev_temp_queue_depth[tindex] += p->dev_lun_queue_depth[tindex];
@@ -7083,7 +7083,7 @@ aic7xxx_device_queue_depth(struct aic7xxx_host *p, Scsi_Device *device)
         {
               printk(INFO_LEAD "Enabled tagged queuing, queue depth %d.\n",
                 p->host_no, device->channel, device->id,
-                device->lun, device->queue_depth);
+                device->lun, p->dev_lun_queue_depth[tindex]);
         }
         p->dev_max_queue_depth[tindex] = p->dev_lun_queue_depth[tindex];
         p->dev_temp_queue_depth[tindex] = p->dev_lun_queue_depth[tindex];

drivers/scsi/scsi_scan.c

@@ -1477,6 +1477,12 @@ static int scsi_add_lun(Scsi_Device *sdevscan, Scsi_Device **sdevnew,
 		if (sdt->detect)
 			sdev->attached += (*sdt->detect) (sdev);
 
+	if (sdev->host->hostt->slave_attach != NULL)
+		if (sdev->host->hostt->slave_attach(sdev) != 0) {
+			printk(KERN_INFO "scsi_add_lun: failed low level driver attach, setting device offline");
+			sdev->online = FALSE;
+		}
+
 	if (sdevnew != NULL)
 		*sdevnew = sdev;
 
@@ -2026,17 +2032,6 @@ static void scsi_scan_selected_lun(struct Scsi_Host *shost, uint channel,
 		 */
 		if (shost->select_queue_depths != NULL)
 			(shost->select_queue_depths) (shost, shost->host_queue);
-		if (shost->hostt->slave_attach != NULL)
-			if ((shost->hostt->slave_attach) (sdev) != 0) {
-				/*
-				 * Low level driver failed to attach this
-				 * device, we've got to kick it back out
-				 * now as a result :-(
-				 */
-				printk("scsi_scan_selected_lun: slave_attach "
-					"failed, marking device OFFLINE.\n");
-				sdev->online = FALSE;
-			}
 
 		for (sdt = scsi_devicelist; sdt; sdt = sdt->next)
 			if (sdt->init && sdt->dev_noticed)

drivers/scsi/scsi_syms.c

@@ -66,6 +66,7 @@ EXPORT_SYMBOL(scsi_do_req);
 EXPORT_SYMBOL(scsi_report_bus_reset);
 EXPORT_SYMBOL(scsi_block_requests);
 EXPORT_SYMBOL(scsi_unblock_requests);
+EXPORT_SYMBOL(scsi_adjust_queue_depth);
 
 EXPORT_SYMBOL(scsi_get_host_dev);
 EXPORT_SYMBOL(scsi_free_host_dev);