Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f0d6436 authored by Seokmann Ju's avatar Seokmann Ju Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct fcport state-management during loss. 



All fcport->state management should be done within
qla2x00_mark_device_lost(), the assignment of state within
qla2x00_mark_vp_devices_dead() caused associated rports to not be
removed.

Signed-off-by: default avatarSeokmann Ju <seokmann.ju@qlogic.com>
Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 246de42c

drivers/scsi/qla2xxx/qla_mid.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha) 
		    "loop_id=0x%04x :%x\n",

		    vha->host_no, fcport->loop_id, fcport->vp_idx));



		atomic_set(&fcport->state, FCS_DEVICE_DEAD);

		qla2x00_mark_device_lost(vha, fcport, 0, 0);

	}

}

drivers/scsi/qla2xxx/qla_os.c

+3 −10
Original line number Diff line number Diff line
@@ -1931,7 +1931,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha, int defer) 
	scsi_qla_host_t *pha = to_qla_parent(ha);



	list_for_each_entry(fcport, &pha->fcports, list) {

		if (ha->vp_idx != 0 && ha->vp_idx != fcport->vp_idx)

		if (ha->vp_idx != fcport->vp_idx)

			continue;

		/*

		 * No point in marking the device as lost, if the device is
@@ -1939,17 +1939,10 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha, int defer) 
		 */

		if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD)

			continue;

		if (atomic_read(&fcport->state) == FCS_ONLINE) {

			if (defer)

		if (atomic_read(&fcport->state) == FCS_ONLINE)

			qla2x00_schedule_rport_del(ha, fcport, defer);

			else if (ha->vp_idx == fcport->vp_idx)

				qla2x00_schedule_rport_del(ha, fcport, defer);

		}

		atomic_set(&fcport->state, FCS_DEVICE_LOST);

	}



	if (defer)

		qla2xxx_wake_dpc(ha);

}



/*