Commit 5fe9f511 authored by Jamie Wellnitz's avatar Jamie Wellnitz Committed by James Bottomley

[PATCH] lpfc 8.1.3: Fix deadlock in lpfc_fdmi_tmo_handler

Fix deadlock in lpfc_fdmi_tmo_handler

lpfc_fdmi_tmo_handler was calling lpfc_fdmi_cmd with the host_lock
held.  lpfc_fdmi_cmd assumes the host_lock is released as it calls functions
that acquire the host_lock.  lpfc_fdmi_tmo_handler acquired the host_lock to
protect access to work_hba_events.  This was already checked in the worker
thread so we can remove that code completely and remove access to the
host_lock.
Signed-off-by: default avatarJamie Wellnitz <Jamie.Wellnitz@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent cf5bf97e
...@@ -1166,11 +1166,6 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba) ...@@ -1166,11 +1166,6 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba)
{ {
struct lpfc_nodelist *ndlp; struct lpfc_nodelist *ndlp;
spin_lock_irq(phba->host->host_lock);
if (!(phba->work_hba_events & WORKER_FDMI_TMO)) {
spin_unlock_irq(phba->host->host_lock);
return;
}
ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, FDMI_DID); ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, FDMI_DID);
if (ndlp) { if (ndlp) {
if (system_utsname.nodename[0] != '\0') { if (system_utsname.nodename[0] != '\0') {
...@@ -1179,7 +1174,6 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba) ...@@ -1179,7 +1174,6 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba)
mod_timer(&phba->fc_fdmitmo, jiffies + HZ * 60); mod_timer(&phba->fc_fdmitmo, jiffies + HZ * 60);
} }
} }
spin_unlock_irq(phba->host->host_lock);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment