1 files changed, 25 insertions, 6 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index b90820a699fd..bccc9c66fa37 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -190,6 +190,7 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 }
 
 
+
 /*
  * Free resources / clean up outstanding I/Os
  * associated with a LPFC_NODELIST entry. This
@@ -199,13 +200,15 @@ int
 lpfc_els_abort(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 {
         LIST_HEAD(completions);
+        LIST_HEAD(txcmplq_completions);
+        LIST_HEAD(abort_list);
         struct lpfc_sli  *psli = &phba->sli;
         struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];
         struct lpfc_iocbq *iocb, *next_iocb;
 
         /* Abort outstanding I/O on NPort <nlp_DID> */
         lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_DISCOVERY,
-                         "0205 Abort outstanding I/O on NPort x%x "
+                         "2819 Abort outstanding I/O on NPort x%x "
                          "Data: x%x x%x x%x\n",
                          ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,
                          ndlp->nlp_rpi);
@@ -224,14 +227,25 @@ lpfc_els_abort(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
         }
 
         /* Next check the txcmplq */
-        list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, list) {
+        list_splice_init(&pring->txcmplq, &txcmplq_completions);
+        spin_unlock_irq(&phba->hbalock);
+
+        list_for_each_entry_safe(iocb, next_iocb, &txcmplq_completions, list) {
                 /* Check to see if iocb matches the nport we are looking for */
-                if (lpfc_check_sli_ndlp(phba, pring, iocb, ndlp)) {
-                        lpfc_sli_issue_abort_iotag(phba, pring, iocb);
-                }
+                if (lpfc_check_sli_ndlp(phba, pring, iocb, ndlp))
+                        list_add_tail(&iocb->dlist, &abort_list);
         }
+        spin_lock_irq(&phba->hbalock);
+        list_splice(&txcmplq_completions, &pring->txcmplq);
         spin_unlock_irq(&phba->hbalock);
 
+        list_for_each_entry_safe(iocb, next_iocb, &abort_list, dlist) {
+                        spin_lock_irq(&phba->hbalock);
+                        list_del_init(&iocb->dlist);
+                        lpfc_sli_issue_abort_iotag(phba, pring, iocb);
+                        spin_unlock_irq(&phba->hbalock);
+        }
+
         /* Cancel all the IOCBs from the completions list */
         lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT,
                               IOERR_SLI_ABORTED);
@@ -626,7 +640,8 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         if (!(vport->fc_flag & FC_PT2PT)) {
                 /* Check config parameter use-adisc or FCP-2 */
                 if ((vport->cfg_use_adisc && (vport->fc_flag & FC_RSCN_MODE)) ||
-                    ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) {
+                    ((ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) &&
+                     (ndlp->nlp_type & NLP_FCP_TARGET))) {
                         spin_lock_irq(shost->host_lock);
                         ndlp->nlp_flag |= NLP_NPR_ADISC;
                         spin_unlock_irq(shost->host_lock);
@@ -962,6 +977,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,
                         mbox->mbox_cmpl = lpfc_mbx_cmpl_fdmi_reg_login;
                         break;
                 default:
+                        ndlp->nlp_flag |= NLP_REG_LOGIN_SEND;
                         mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
                 }
                 mbox->context2 = lpfc_nlp_get(ndlp);
@@ -972,6 +988,8 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,
                                            NLP_STE_REG_LOGIN_ISSUE);
                         return ndlp->nlp_state;
                 }
+                if (ndlp->nlp_flag & NLP_REG_LOGIN_SEND)
+                        ndlp->nlp_flag &= ~NLP_REG_LOGIN_SEND;
                 /* decrement node reference count to the failed mbox
                  * command
                  */
@@ -1458,6 +1476,7 @@ lpfc_device_recov_reglogin_issue(struct lpfc_vport *vport,
         ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
         spin_lock_irq(shost->host_lock);
+        ndlp->nlp_flag |= NLP_IGNR_REG_CMPL;
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         spin_unlock_irq(shost->host_lock);
         lpfc_disc_set_adisc(vport, ndlp);