hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
James Smart 2007-04-25 09:52:41 -04:00 committed by James Bottomley
parent 7054a606e6
commit 82085718fa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/lpfc/lpfc_hbadisc.c
View File

@ -109,6 +109,9 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
return; return;
} }
if (ndlp->nlp_state == NLP_STE_MAPPED_NODE)
return;
name = (uint8_t *)&ndlp->nlp_portname; name = (uint8_t *)&ndlp->nlp_portname;
phba = ndlp->nlp_phba; phba = ndlp->nlp_phba;
@ -149,7 +152,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
if (!(phba->fc_flag & FC_UNLOADING) && if (!(phba->fc_flag & FC_UNLOADING) &&
!(ndlp->nlp_flag & NLP_DELAY_TMO) && !(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); lpfc_disc_state_machine(phba, ndlp, NULL, NLP_EVT_DEVICE_RM);
else { else {
rdata->pnode = NULL; 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 * already. If we have, and it's a scsi entity, be
* sure to unblock any attached scsi devices * sure to unblock any attached scsi devices
*/ */
if (!ndlp->rport ||
ndlp->rport->port_state == FC_PORTSTATE_BLOCKED)
lpfc_register_remote_port(phba, ndlp); lpfc_register_remote_port(phba, ndlp);
} }