1 files changed, 38 insertions, 84 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 56052f4510c3..259eeb161b82 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -890,10 +890,7 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         pmb->context1 = NULL;
 
-        if (ndlp->nlp_rpi != 0)
-                lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
         ndlp->nlp_rpi = mb->un.varWords[0];
-        lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi);
         ndlp->nlp_type |= NLP_FABRIC;
         ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
         lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
@@ -981,10 +978,7 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         pmb->context1 = NULL;
 
-        if (ndlp->nlp_rpi != 0)
-                lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
         ndlp->nlp_rpi = mb->un.varWords[0];
-        lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi);
         ndlp->nlp_type |= NLP_FABRIC;
         ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
         lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
@@ -1028,6 +1022,7 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
         if (ndlp->nlp_type & NLP_FCP_INITIATOR)
                 rport_ids.roles |= FC_RPORT_ROLE_FCP_INITIATOR;
 
+        scsi_block_requests(phba->host);
         ndlp->rport = rport = fc_remote_port_add(phba->host, 0, &rport_ids);
         if (!rport) {
                 dev_printk(KERN_WARNING, &phba->pcidev->dev,
@@ -1044,6 +1039,23 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
         }
         rdata = rport->dd_data;
         rdata->pnode = ndlp;
+        scsi_unblock_requests(phba->host);
+
+        return;
+}
+
+static void
+lpfc_unregister_remote_port(struct lpfc_hba * phba,
+                            struct lpfc_nodelist * ndlp)
+{
+        struct fc_rport *rport = ndlp->rport;
+        struct lpfc_rport_data *rdata = rport->dd_data;
+
+        ndlp->rport = NULL;
+        rdata->pnode = NULL;
+        scsi_block_requests(phba->host);
+        fc_remote_port_delete(rport);
+        scsi_unblock_requests(phba->host);
 
         return;
 }
@@ -1260,7 +1272,7 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list)
                  * may have removed the remote port.
                  */
                 if ((rport_del != none) && nlp->rport)
-                        fc_remote_port_block(nlp->rport);
+                        lpfc_unregister_remote_port(phba, nlp);
 
                 if (rport_add != none) {
                         /*
@@ -1270,8 +1282,6 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list)
                          */
                         if (!nlp->rport)
                                 lpfc_register_remote_port(phba, nlp);
-                        else
-                                fc_remote_port_unblock(nlp->rport);
 
                         /*
                          * if we added to Mapped list, but the remote port
@@ -1435,10 +1445,9 @@ lpfc_no_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
                                                                    iocb, iocb);
                                                 spin_lock_irq(phba->host->
                                                               host_lock);
-                                        } else {
-                                                list_add_tail(&iocb->list,
-                                                        &phba->lpfc_iocb_list);
-                                        }
+                                        } else
+                                                lpfc_sli_release_iocbq(phba,
+                                                                       iocb);
                                 }
                         }
                         spin_unlock_irq(phba->host->host_lock);
@@ -1472,7 +1481,6 @@ lpfc_unreg_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
                         if (rc == MBX_NOT_FINISHED)
                                 mempool_free( mbox, phba->mbox_mem_pool);
                 }
-                lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
                 lpfc_no_rpi(phba, ndlp);
                 ndlp->nlp_rpi = 0;
                 return 1;
@@ -1490,7 +1498,6 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
         LPFC_MBOXQ_t       *mb;
         LPFC_MBOXQ_t       *nextmb;
         struct lpfc_dmabuf *mp;
-        struct fc_rport *rport;
 
         /* Cleanup node for NPort <nlp_DID> */
         lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
@@ -1507,10 +1514,7 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
          * and flush cache's w/o generating flush errors.
          */
         if ((ndlp->rport) && !(phba->fc_flag & FC_UNLOADING)) {
-                rport = ndlp->rport;
-                ndlp->rport = NULL;
-                fc_remote_port_unblock(rport);
-                fc_remote_port_delete(rport);
+                lpfc_unregister_remote_port(phba, ndlp);
                 ndlp->nlp_sid = NLP_NO_SID;
         }
 
@@ -2422,10 +2426,7 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         pmb->context1 = NULL;
 
-        if (ndlp->nlp_rpi != 0)
-                lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
         ndlp->nlp_rpi = mb->un.varWords[0];
-        lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi);
         ndlp->nlp_type |= NLP_FABRIC;
         ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
         lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
@@ -2451,75 +2452,28 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 }
 
 /*
- * This routine looks up the ndlp hash
- * table for the given RPI. If rpi found
+ * This routine looks up the ndlp  lists
+ * for the given RPI. If rpi found
  * it return the node list pointer
- * else return 0.
+ * else return NULL.
  */
 struct lpfc_nodelist *
 lpfc_findnode_rpi(struct lpfc_hba * phba, uint16_t rpi)
 {
-        struct lpfc_nodelist *ret;
-
-        ret = phba->fc_nlplookup[LPFC_RPI_HASH_FUNC(rpi)];
-        while ((ret != 0) && (ret->nlp_rpi != rpi)) {
-                ret = ret->nlp_rpi_hash_next;
-        }
-        return ret;
-}
-
-/*
- * This routine looks up the ndlp hash table for the
- * given RPI. If rpi found it return the node list
- * pointer else return 0 after deleting the entry
- * from hash table.
- */
-struct lpfc_nodelist *
-lpfc_findnode_remove_rpi(struct lpfc_hba * phba, uint16_t rpi)
-{
-        struct lpfc_nodelist *ret, *temp;;
-
-        ret = phba->fc_nlplookup[LPFC_RPI_HASH_FUNC(rpi)];
-        if (ret == 0)
-                return NULL;
-
-        if (ret->nlp_rpi == rpi) {
-                phba->fc_nlplookup[LPFC_RPI_HASH_FUNC(rpi)] =
-                    ret->nlp_rpi_hash_next;
-                ret->nlp_rpi_hash_next = NULL;
-                return ret;
-        }
-
-        while ((ret->nlp_rpi_hash_next != 0) &&
-               (ret->nlp_rpi_hash_next->nlp_rpi != rpi)) {
-                ret = ret->nlp_rpi_hash_next;
-        }
-
-        if (ret->nlp_rpi_hash_next != 0) {
-                temp = ret->nlp_rpi_hash_next;
-                ret->nlp_rpi_hash_next = temp->nlp_rpi_hash_next;
-                temp->nlp_rpi_hash_next = NULL;
-                return temp;
-        } else {
-                return NULL;
-        }
-}
-
-/*
- * This routine adds the node list entry to the
- * ndlp hash table.
- */
-void
-lpfc_addnode_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
-                 uint16_t rpi)
-{
+        struct lpfc_nodelist *ndlp;
+        struct list_head * lists[]={&phba->fc_nlpunmap_list,
+                                    &phba->fc_nlpmap_list,
+                                    &phba->fc_plogi_list,
+                                    &phba->fc_adisc_list,
+                                    &phba->fc_reglogin_list};
+        int i;
 
-        uint32_t index;
+        for (i = 0; i < ARRAY_SIZE(lists); i++ )
+                list_for_each_entry(ndlp, lists[i], nlp_listp)
+                        if (ndlp->nlp_rpi == rpi)
+                                return (ndlp);
 
-        index = LPFC_RPI_HASH_FUNC(rpi);
-        ndlp->nlp_rpi_hash_next = phba->fc_nlplookup[index];
-        phba->fc_nlplookup[index] = ndlp;
-        return;
+        return NULL;
 }
 
 void