Commit 5fe9f511 authored Feb 28, 2006 by Jamie Wellnitz Committed by James Bottomley Mar 06, 2006

[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>

parent cf5bf97e

drivers/scsi/lpfc/lpfc_ct.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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;
		}