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 <skashyap@marvell.com>
Signed-off-by: Javed Hasan <jhasan@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qedf/qedf_els.c b/drivers/scsi/qedf/qedf_els.c
index ab4b1a958eab5b5d5155bf66907673d89b82131f..edd67024a375fd2ea36d4709bbf0b41f7f239458 100644 (file)
--- 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",