From: Saurav Kashyap Date: Fri, 7 Aug 2020 11:06:52 +0000 (-0700) Subject: scsi: qedf: Do not kill timeout work for original I/O on RRQ completion X-Git-Tag: io_uring-5.10-2020-10-20~61^2~200 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b09ea43fecd23c73bac74620d51ac40529ae319d;p=linux-2.6-block.git scsi: qedf: Do not kill timeout work for original I/O on RRQ completion The timer is already cancelled when abort is completed, hence no need to cancel it again. Link: https://lore.kernel.org/r/20200807110656.19965-4-jhasan@marvell.com Signed-off-by: Saurav Kashyap Signed-off-by: Javed Hasan Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/qedf/qedf_els.c b/drivers/scsi/qedf/qedf_els.c index ab4b1a958eab..edd67024a375 100644 --- a/drivers/scsi/qedf/qedf_els.c +++ b/drivers/scsi/qedf/qedf_els.c @@ -185,10 +185,6 @@ static void qedf_rrq_compl(struct qedf_els_cb_arg *cb_arg) goto out_free; } - if (rrq_req->event != QEDF_IOREQ_EV_ELS_TMO && - rrq_req->event != QEDF_IOREQ_EV_ELS_ERR_DETECT) - cancel_delayed_work_sync(&orig_io_req->timeout_work); - refcount = kref_read(&orig_io_req->refcount); QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_ELS, "rrq_compl: orig io = %p," " orig xid = 0x%x, rrq_xid = 0x%x, refcount=%d\n",