Commit 67630392 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley

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

Fix issue where the driver would reference the incorrect HA
during loop state check.
parent ec5dd9c2
...@@ -795,7 +795,7 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*fn)(struct scsi_cmnd *)) ...@@ -795,7 +795,7 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*fn)(struct scsi_cmnd *))
* Either PORT_DOWN_TIMER OR LINK_DOWN_TIMER Expired. * Either PORT_DOWN_TIMER OR LINK_DOWN_TIMER Expired.
*/ */
if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD || 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 * Add the command to the done-queue for later failover
* processing * processing
...@@ -3209,7 +3209,7 @@ qla2x00_do_dpc(void *data) ...@@ -3209,7 +3209,7 @@ qla2x00_do_dpc(void *data)
if (atomic_read(&fcport->state) == if (atomic_read(&fcport->state) ==
FCS_DEVICE_DEAD || FCS_DEVICE_DEAD ||
atomic_read(&ha->loop_state) == LOOP_DEAD) { atomic_read(&fcport->ha->loop_state) == LOOP_DEAD) {
__del_from_retry_queue(ha, sp); __del_from_retry_queue(ha, sp);
sp->cmd->result = DID_NO_CONNECT << 16; sp->cmd->result = DID_NO_CONNECT << 16;
...@@ -3900,7 +3900,7 @@ qla2x00_cmd_timeout(srb_t *sp) ...@@ -3900,7 +3900,7 @@ qla2x00_cmd_timeout(srb_t *sp)
* DID_BUS_BUSY to let the OS retry this cmd. * DID_BUS_BUSY to let the OS retry this cmd.
*/ */
if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD || 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; cmd->result = DID_NO_CONNECT << 16;
if (atomic_read(&fcport->ha->loop_state) == LOOP_DOWN) if (atomic_read(&fcport->ha->loop_state) == LOOP_DOWN)
sp->err_id = SRB_ERR_LOOP; sp->err_id = SRB_ERR_LOOP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment