[SCSI] lpfc 8.1.12 : Collapse discovery lists to a single node list

Collapse discovery lists to a single node list.

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index efd1cf638b8c..cc0f845d8b38 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1175,10 +1175,12 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)
          * fail, this routine returns failure to the midlayer.
          */
         for (i = 0; i < LPFC_MAX_TARGET; i++) {
-                /* Search the mapped list for this target ID */
+                /* Search for mapped node by target ID */
                 match = 0;
-                list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
-                        if ((i == ndlp->nlp_sid) && ndlp->rport) {
+                list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp) {
+                        if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&
+                            i == ndlp->nlp_sid &&
+                            ndlp->rport) {
                                 match = 1;
                                 break;
                         }