From d0a373749c85543b13242a722fa4899dccd47b9d Mon Sep 17 00:00:00 2001 From: James Smart Date: Wed, 25 Apr 2007 09:52:41 -0400 Subject: [PATCH] --- yaml --- r: 55201 b: refs/heads/master c: 82085718faa6955c8a78b2e6ac2ad95072ac875a h: refs/heads/master i: 55199: 1c12c4573e4b6909307e7f18e350c64ab96ee15a v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8d28aab3d01f..311f90415d77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7054a606e6724674a5acd103ed74eacb02c73393 +refs/heads/master: 82085718faa6955c8a78b2e6ac2ad95072ac875a diff --git a/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c b/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c index fda8f07f1d0b..5f8698bcecb9 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -109,6 +109,9 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) return; } + if (ndlp->nlp_state == NLP_STE_MAPPED_NODE) + return; + name = (uint8_t *)&ndlp->nlp_portname; phba = ndlp->nlp_phba; @@ -149,7 +152,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) if (!(phba->fc_flag & FC_UNLOADING) && !(ndlp->nlp_flag & NLP_DELAY_TMO) && - !(ndlp->nlp_flag & NLP_NPR_2B_DISC)) + !(ndlp->nlp_flag & NLP_NPR_2B_DISC) && + (ndlp->nlp_state != NLP_STE_UNMAPPED_NODE)) lpfc_disc_state_machine(phba, ndlp, NULL, NLP_EVT_DEVICE_RM); else { rdata->pnode = NULL; @@ -1326,8 +1330,6 @@ lpfc_nlp_state_cleanup(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp, * already. If we have, and it's a scsi entity, be * sure to unblock any attached scsi devices */ - if (!ndlp->rport || - ndlp->rport->port_state == FC_PORTSTATE_BLOCKED) lpfc_register_remote_port(phba, ndlp); }