[SCSI] lpfc 8.1.5 : Misc small fixes
Contains the following misc fixes: - Fix build warnings - Race condition in lpfc_workq_post_event() could corrupt phba->work_list. - nlp_sid was not being initialized properly - Fix some RSCN handling during the re-discovery after Link Up event. Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:

committed by
James Bottomley

parent
10d4e957e0
commit
071fbd3de9
@@ -311,8 +311,8 @@ lpfc_workq_post_event(struct lpfc_hba * phba, void *arg1, void *arg2,
|
||||
evtp->evt_arg2 = arg2;
|
||||
evtp->evt = evt;
|
||||
|
||||
list_add_tail(&evtp->evt_listp, &phba->work_list);
|
||||
spin_lock_irq(phba->host->host_lock);
|
||||
list_add_tail(&evtp->evt_listp, &phba->work_list);
|
||||
if (phba->work_wait)
|
||||
wake_up(phba->work_wait);
|
||||
spin_unlock_irq(phba->host->host_lock);
|
||||
@@ -1071,10 +1071,6 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
|
||||
/* initialize static port data */
|
||||
rport->maxframe_size = ndlp->nlp_maxframe;
|
||||
rport->supported_classes = ndlp->nlp_class_sup;
|
||||
if ((rport->scsi_target_id != -1) &&
|
||||
(rport->scsi_target_id < MAX_FCP_TARGET)) {
|
||||
ndlp->nlp_sid = rport->scsi_target_id;
|
||||
}
|
||||
rdata = rport->dd_data;
|
||||
rdata->pnode = ndlp;
|
||||
|
||||
@@ -1087,6 +1083,10 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
|
||||
if (rport_ids.roles != FC_RPORT_ROLE_UNKNOWN)
|
||||
fc_remote_port_rolechg(rport, rport_ids.roles);
|
||||
|
||||
if ((rport->scsi_target_id != -1) &&
|
||||
(rport->scsi_target_id < MAX_FCP_TARGET)) {
|
||||
ndlp->nlp_sid = rport->scsi_target_id;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -1905,10 +1905,8 @@ lpfc_setup_disc_node(struct lpfc_hba * phba, uint32_t did)
|
||||
*/
|
||||
if (ndlp->nlp_flag & NLP_DELAY_TMO)
|
||||
lpfc_cancel_retry_delay_tmo(phba, ndlp);
|
||||
} else {
|
||||
ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
|
||||
} else
|
||||
ndlp = NULL;
|
||||
}
|
||||
} else {
|
||||
flg = ndlp->nlp_flag & NLP_LIST_MASK;
|
||||
if ((flg == NLP_ADISC_LIST) || (flg == NLP_PLOGI_LIST))
|
||||
|
Reference in New Issue
Block a user