aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2007-04-25 09:52:41 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-06 10:33:14 -0400
commit82085718faa6955c8a78b2e6ac2ad95072ac875a (patch)
tree2516539a203d40bcf14969c000078bce279221d3 /drivers/scsi/lpfc
parent7054a606e6724674a5acd103ed74eacb02c73393 (diff)
[SCSI] lpfc 8.1.12 : Fixed recovery of rport after race with dev_loss_tmo
Fixed recovery of rport after race with dev_loss_tmo Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r--drivers/scsi/lpfc/lpfc_hbadisc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index fda8f07f1d0b..5f8698bcecb9 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -109,6 +109,9 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
109 return; 109 return;
110 } 110 }
111 111
112 if (ndlp->nlp_state == NLP_STE_MAPPED_NODE)
113 return;
114
112 name = (uint8_t *)&ndlp->nlp_portname; 115 name = (uint8_t *)&ndlp->nlp_portname;
113 phba = ndlp->nlp_phba; 116 phba = ndlp->nlp_phba;
114 117
@@ -149,7 +152,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
149 152
150 if (!(phba->fc_flag & FC_UNLOADING) && 153 if (!(phba->fc_flag & FC_UNLOADING) &&
151 !(ndlp->nlp_flag & NLP_DELAY_TMO) && 154 !(ndlp->nlp_flag & NLP_DELAY_TMO) &&
152 !(ndlp->nlp_flag & NLP_NPR_2B_DISC)) 155 !(ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
156 (ndlp->nlp_state != NLP_STE_UNMAPPED_NODE))
153 lpfc_disc_state_machine(phba, ndlp, NULL, NLP_EVT_DEVICE_RM); 157 lpfc_disc_state_machine(phba, ndlp, NULL, NLP_EVT_DEVICE_RM);
154 else { 158 else {
155 rdata->pnode = NULL; 159 rdata->pnode = NULL;
@@ -1326,8 +1330,6 @@ lpfc_nlp_state_cleanup(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
1326 * already. If we have, and it's a scsi entity, be 1330 * already. If we have, and it's a scsi entity, be
1327 * sure to unblock any attached scsi devices 1331 * sure to unblock any attached scsi devices
1328 */ 1332 */
1329 if (!ndlp->rport ||
1330 ndlp->rport->port_state == FC_PORTSTATE_BLOCKED)
1331 lpfc_register_remote_port(phba, ndlp); 1333 lpfc_register_remote_port(phba, ndlp);
1332 } 1334 }
1333 1335