Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b455cf3 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.37: Fixed stale ndlp state when the node is marked for deferred removal. 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent edccdc17

drivers/scsi/lpfc/lpfc_nportdisc.c

+10 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,13 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport, 
				 "0261 Cannot Register NameServer login\n");

	}



	/*

	** In case the node reference counter does not go to zero, ensure that

	** the stale state for the node is not processed.

	*/



	ndlp->nlp_prev_state = ndlp->nlp_state;

	lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);

	spin_lock_irq(shost->host_lock);

	ndlp->nlp_flag |= NLP_DEFER_RM;

	spin_unlock_irq(shost->host_lock);
@@ -2159,13 +2166,16 @@ lpfc_cmpl_plogi_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
{

	struct lpfc_iocbq *cmdiocb, *rspiocb;

	IOCB_t *irsp;

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);



	cmdiocb = (struct lpfc_iocbq *) arg;

	rspiocb = cmdiocb->context_un.rsp_iocb;



	irsp = &rspiocb->iocb;

	if (irsp->ulpStatus) {

		spin_lock_irq(shost->host_lock);

		ndlp->nlp_flag |= NLP_DEFER_RM;

		spin_unlock_irq(shost->host_lock);

		return NLP_STE_FREED_NODE;

	}

	return ndlp->nlp_state;