PATCH [8/15] qla2xxx: Use proper HA references

PATCH Andrew Vasquez 1 participant 1 message Mar 14, 2004

Subsystems (2)

SCSI QLogic QLA2XXX FC-SCSI driver

lore

Share & tools

lore

Andrew Vasquez

author

2004-03-14 08:22 UTC #0 lore raw

ChangeSet
1.1664 04/03/01 14:26:47 [email protected] +1 -0 Fix issue where the driver would reference the incorrect HA during loop state check.

Note: This could only occur during failover mode.

 drivers/scsi/qla2xxx/qla_os.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

ftp://ftp.qlogic.com/outgoing/linux/patches/8.x/8.00.00b11k/17_fix_ha_reference.patch

drivers/scsi/qla2xxx/qla_os.c +3 -3

diff -Nru a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
@@ -795,7 +795,7 @@
 	 *	Either PORT_DOWN_TIMER OR LINK_DOWN_TIMER Expired.
 	 */
 	if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
-	    atomic_read(&ha->loop_state) == LOOP_DEAD) {
+	    atomic_read(&ha2->loop_state) == LOOP_DEAD) {
 		/*
 		 * Add the command to the done-queue for later failover
 		 * processing

@@ -3209,7 +3209,7 @@
 
 				if (atomic_read(&fcport->state) ==
 				    FCS_DEVICE_DEAD ||
-				    atomic_read(&ha->loop_state) == LOOP_DEAD) {
+				    atomic_read(&fcport->ha->loop_state) == LOOP_DEAD) {
 
 					__del_from_retry_queue(ha, sp);
 					sp->cmd->result = DID_NO_CONNECT << 16;

@@ -3900,7 +3900,7 @@
 		 * DID_BUS_BUSY to let the OS  retry this cmd.
 		 */
 		if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
-		    atomic_read(&vis_ha->loop_state) == LOOP_DEAD) {
+		    atomic_read(&fcport->ha->loop_state) == LOOP_DEAD) {
 			cmd->result = DID_NO_CONNECT << 16;
 			if (atomic_read(&fcport->ha->loop_state) == LOOP_DOWN) 
 				sp->err_id = SRB_ERR_LOOP;