summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_ct.c
diff options
context:
space:
mode:
authorJamie Wellnitz <Jamie.Wellnitz@emulex.com>2006-02-28 22:33:09 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-06 09:47:14 -0600
commit5fe9f5119378e75986ad90c783a7e085bf67703a (patch)
treeb06f5d7bb921f78dd284a960792523355249c3d1 /drivers/scsi/lpfc/lpfc_ct.c
parentcf5bf97e1d28651fd689be9c974b2318ac262f2d (diff)
downloadblackbird-op-linux-5fe9f5119378e75986ad90c783a7e085bf67703a.tar.gz
blackbird-op-linux-5fe9f5119378e75986ad90c783a7e085bf67703a.zip
[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: Jamie Wellnitz <Jamie.Wellnitz@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_ct.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_ct.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index f3b280313a74..b65ee57af53e 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1166,11 +1166,6 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba)
{
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);
if (ndlp) {
if (system_utsname.nodename[0] != '\0') {
@@ -1179,7 +1174,6 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba)
mod_timer(&phba->fc_fdmitmo, jiffies + HZ * 60);
}
}
- spin_unlock_irq(phba->host->host_lock);
return;
}
OpenPOWER on IntegriCloud