2 files changed, 15 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 6d12cd0c49ff..4813beaaca8f 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1523,6 +1523,12 @@ lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp)
 
         ndlp->nlp_flag &= ~NLP_DELAY_TMO;
         spin_unlock_irq(phba->host->host_lock);
+        /*
+         * If a discovery event readded nlp_delayfunc after timer
+         * firing and before processing the timer, cancel the
+         * nlp_delayfunc.
+         */
+        del_timer_sync(&ndlp->nlp_delayfunc);
         retry = ndlp->nlp_retry;
 
         switch (cmd) {
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index e15120d21aaa..82704148d5d4 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -68,6 +68,15 @@ lpfc_process_nodev_timeout(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
                 return;
         }
 
+        /*
+         * If a discovery event readded nodev_timer after timer
+         * firing and before processing the timer, cancel the
+         * nlp_tmofunc.
+         */
+        spin_unlock_irq(phba->host->host_lock);
+        del_timer_sync(&ndlp->nlp_tmofunc);
+        spin_lock_irq(phba->host->host_lock);
+
         ndlp->nlp_flag &= ~NLP_NODEV_TMO;
 
         if (ndlp->nlp_sid != NLP_NO_SID) {