mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 01:23:20 +00:00
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>
This commit is contained in:
parent
0754d5e003
commit
e112761a4f
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user