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

Commit b85e0957 authored by Joe Carnuccio's avatar Joe Carnuccio Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Add timeout ability to wait_for_sess_deletion(). 



Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fed0f68a

drivers/scsi/qla2xxx/qla_os.c

+1 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ qla2x00_wait_for_sess_deletion(scsi_qla_host_t *vha) 
{

	qla2x00_mark_all_devices_lost(vha, 0);



	wait_event(vha->fcport_waitQ, test_fcport_count(vha));

	wait_event_timeout(vha->fcport_waitQ, test_fcport_count(vha), 10*HZ);

}



/*

drivers/scsi/qla2xxx/qla_target.c

+2 −2
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ int qlt_stop_phase1(struct qla_tgt *tgt) 
	ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00a,

	    "Waiting for tgt %p: sess_count=%d\n", tgt, tgt->sess_count);



	wait_event(tgt->waitQ, test_tgt_sess_count(tgt));

	wait_event_timeout(tgt->waitQ, test_tgt_sess_count(tgt), 10*HZ);



	/* Big hammer */

	if (!ha->flags.host_shutting_down &&
@@ -1487,7 +1487,7 @@ int qlt_stop_phase1(struct qla_tgt *tgt) 
		qlt_disable_vha(vha);



	/* Wait for sessions to clear out (just in case) */

	wait_event(tgt->waitQ, test_tgt_sess_count(tgt));

	wait_event_timeout(tgt->waitQ, test_tgt_sess_count(tgt), 10*HZ);

	return 0;

}

EXPORT_SYMBOL(qlt_stop_phase1);