| Message ID | 577d5da2.z0GKKgjcgUhFJ0Im%james.smart@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 07/06/2016 09:36 PM, James Smart wrote: > > Correct FCOE discovery to avoid loss of storage devices after system reboot > > Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> > Signed-off-by: James Smart <james.smart@broadcom.com> > --- > drivers/scsi/lpfc/lpfc_init.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c > index bb514d2..8d940ed 100644 > --- a/drivers/scsi/lpfc/lpfc_init.c > +++ b/drivers/scsi/lpfc/lpfc_init.c > @@ -4484,7 +4484,8 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba, > * the corresponding FCF bit in the roundrobin bitmap. > */ > spin_lock_irq(&phba->hbalock); > - if (phba->fcf.fcf_flag & FCF_DISCOVERY) { > + if ((phba->fcf.fcf_flag & FCF_DISCOVERY) && > + (phba->fcf.current_rec.fcf_indx != acqe_fip->index)) { > spin_unlock_irq(&phba->hbalock); > /* Update FLOGI FCF failover eligible FCF bmask */ > lpfc_sli4_fcf_rr_index_clear(phba, acqe_fip->index); > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index bb514d2..8d940ed 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -4484,7 +4484,8 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba, * the corresponding FCF bit in the roundrobin bitmap. */ spin_lock_irq(&phba->hbalock); - if (phba->fcf.fcf_flag & FCF_DISCOVERY) { + if ((phba->fcf.fcf_flag & FCF_DISCOVERY) && + (phba->fcf.current_rec.fcf_indx != acqe_fip->index)) { spin_unlock_irq(&phba->hbalock); /* Update FLOGI FCF failover eligible FCF bmask */ lpfc_sli4_fcf_rr_index_clear(phba, acqe_fip->index);