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

Commit e112761a authored Aug 31, 2018 by Quinn Tran Committed by Martin K. Petersen Sep 11, 2018

scsi: qla2xxx: Turn off IOCB timeout timer on IOCB completion

Turn off IOCB timeout timer on IOCB completion instead of turning it off in a
deferred task. This prevent false alarm if the deferred task is stalled out.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 0754d5e0

drivers/scsi/qla2xxx/qla_gs.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -4175,10 +4175,13 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)
		return;
		}

		if (cmd == GPN_FT_CMD)
		if (cmd == GPN_FT_CMD) {
		del_timer(&sp->u.iocb_cmd.timer);
		e = qla2x00_alloc_work(vha, QLA_EVT_GPNFT_DONE);
		else
		} else {
		e = qla2x00_alloc_work(vha, QLA_EVT_GNNFT_DONE);
		}

		if (!e) {
		/* please ignore kernel warning. Otherwise, we have mem leak. */
		if (sp->u.iocb_cmd.u.ctarg.req) {
		@@ -4307,7 +4310,6 @@ void qla24xx_async_gpnft_done(scsi_qla_host_t vha, srb_t sp)
		{
		ql_dbg(ql_dbg_disc, vha, 0xffff,
		"%s enter\n", __func__);
		del_timer(&sp->u.iocb_cmd.timer);
		qla24xx_async_gnnft(vha, sp, sp->gen2);
		}