From: James Smart Date: Thu, 18 Apr 2013 00:18:19 +0000 (-0400) Subject: [SCSI] lpfc 8.3.39: Fixed deadlock between hbalock and nlp_lock use X-Git-Tag: firefly_0821_release~3680^2~485^2~1^2~38 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a62a435adaa0137ca2a53bc2b57f99ffe0324bcb;p=firefly-linux-kernel-4.4.55.git [SCSI] lpfc 8.3.39: Fixed deadlock between hbalock and nlp_lock use Signed-off-by: James Smart Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 3081db730b44..3faa0a92331a 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -160,11 +160,12 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) if (!list_empty(&evtp->evt_listp)) return; + evtp->evt_arg1 = lpfc_nlp_get(ndlp); + spin_lock_irq(&phba->hbalock); /* We need to hold the node by incrementing the reference * count until this queued work is done */ - evtp->evt_arg1 = lpfc_nlp_get(ndlp); if (evtp->evt_arg1) { evtp->evt = LPFC_EVT_DEV_LOSS; list_add_tail(&evtp->evt_listp, &phba->work_list);