diff options
| author | Quinn Tran <quinn.tran@cavium.com> | 2018-08-31 11:24:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-01 08:26:07 +0200 |
| commit | 6b449e4cf09021310552e319fa1cccff45b67a4a (patch) | |
| tree | 8839bbd2698a9c27a61885ed19350c4097725ee1 | |
| parent | 9423770eb336d727bb06eced64a27039d225f75b (diff) | |
| download | linux-stable-6b449e4cf09021310552e319fa1cccff45b67a4a.tar.gz linux-stable-6b449e4cf09021310552e319fa1cccff45b67a4a.tar.bz2 linux-stable-6b449e4cf09021310552e319fa1cccff45b67a4a.zip | |
scsi: qla2xxx: Turn off IOCB timeout timer on IOCB completion
[ Upstream commit e112761a4f1dcbe9fb9f43f46de7be69d6963b0d ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_gs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index fc08e46a93ca..98d936f18b65 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -4225,10 +4225,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) { @@ -4357,7 +4360,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); } |