merge by hand (fix up qla_os.c merge error)
authorJames Bottomley <jejb@titanic.(none)>
Fri, 17 Jun 2005 23:42:23 +0000 (18:42 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Fri, 17 Jun 2005 23:42:23 +0000 (18:42 -0500)
1  2 
drivers/block/elevator.c
drivers/ieee1394/sbp2.c
drivers/scsi/Kconfig
drivers/scsi/aic7xxx/aic79xx_osm.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_scan.c

Simple merge
Simple merge
Simple merge
Simple merge
index 3c97aa45772dc4aea2b7c4dbd759e76fa46c1745,f12a2b6fa7a06995de0a2a1dbeac71495981ed6d..e6831264f67ca87002b1b96151795035cebf1af6
@@@ -519,8 -476,7 +477,7 @@@ qla2xxx_eh_abort(struct scsi_cmnd *cmd
        serial = cmd->serial_number;
  
        /* Check active list for command command. */
-       spin_unlock_irq(ha->host->host_lock);
 -      spin_lock(&ha->hardware_lock);
 +      spin_lock_irqsave(&ha->hardware_lock, flags);
        for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
                sp = ha->outstanding_cmds[i];
  
                            "scsi(%ld:%d:%d): Abort handler timed out -- %lx "
                            "%x.\n", ha->host_no, id, lun, serial, ret);
                }
 -              spin_lock(&ha->hardware_lock);
        }
-       spin_lock_irq(ha->host->host_lock);
  
        qla_printk(KERN_INFO, ha, 
            "scsi(%ld:%d:%d): Abort command issued -- %lx %x.\n", ha->host_no,
Simple merge