1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index bb015960dbc9..154c715fb3af 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -658,6 +658,8 @@ lpfc_work_done(struct lpfc_hba *phba)
                                 lpfc_ramp_down_queue_handler(phba);
                         if (work_port_events & WORKER_RAMP_UP_QUEUE)
                                 lpfc_ramp_up_queue_handler(phba);
+                        if (work_port_events & WORKER_DELAYED_DISC_TMO)
+                                lpfc_delayed_disc_timeout_handler(vport);
                 }
         lpfc_destroy_vport_work_array(phba, vports);
 
@@ -838,6 +840,11 @@ lpfc_linkdown_port(struct lpfc_vport *vport)
 
         lpfc_port_link_failure(vport);
 
+        /* Stop delayed Nport discovery */
+        spin_lock_irq(shost->host_lock);
+        vport->fc_flag &= ~FC_DISC_DELAYED;
+        spin_unlock_irq(shost->host_lock);
+        del_timer_sync(&vport->delayed_disc_tmo);
 }
 
 int
@@ -3160,7 +3167,7 @@ lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         spin_unlock_irq(shost->host_lock);
         vport->unreg_vpi_cmpl = VPORT_OK;
         mempool_free(pmb, phba->mbox_mem_pool);
-        lpfc_cleanup_vports_rrqs(vport);
+        lpfc_cleanup_vports_rrqs(vport, NULL);
         /*
          * This shost reference might have been taken at the beginning of
          * lpfc_vport_delete()
@@ -3900,6 +3907,8 @@ lpfc_drop_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
                 return;
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNUSED_NODE);
+        if (vport->phba->sli_rev == LPFC_SLI_REV4)
+                lpfc_cleanup_vports_rrqs(vport, ndlp);
         lpfc_nlp_put(ndlp);
         return;
 }
@@ -4289,7 +4298,7 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 
         list_del_init(&ndlp->els_retry_evt.evt_listp);
         list_del_init(&ndlp->dev_loss_evt.evt_listp);
-
+        lpfc_cleanup_vports_rrqs(vport, ndlp);
         lpfc_unreg_rpi(vport, ndlp);
 
         return 0;
@@ -4426,10 +4435,11 @@ lpfc_findnode_did(struct lpfc_vport *vport, uint32_t did)
 {
         struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
         struct lpfc_nodelist *ndlp;
+        unsigned long iflags;
 
-        spin_lock_irq(shost->host_lock);
+        spin_lock_irqsave(shost->host_lock, iflags);
         ndlp = __lpfc_findnode_did(vport, did);
-        spin_unlock_irq(shost->host_lock);
+        spin_unlock_irqrestore(shost->host_lock, iflags);
         return ndlp;
 }