[SCSI] lpfc 8.1.4 : Two misc fixes (fc6c12bc) · Commits · 戴 / test

Two misc fixes: - Fix deadlock caused by return with host_lock held in lpfc_findnode_did - Initialize all fields of the allocated mail box structure to zero. Was causing some sysfs mailbox commands to fail immediately after load. Signed-off-by:

James Smart <James.Smart@emulex.com> Signed-off-by:

James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/lpfc/lpfc_attr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -856,7 +856,7 @@ sysfs_mbox_write(struct kobject kobj, char buf, loff_t off, size_t count)
		mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
		if (!mbox)
		return -ENOMEM;

		memset(mbox, 0, sizeof (LPFC_MBOXQ_t));
		}

		spin_lock_irq(host->host_lock);

drivers/scsi/lpfc/lpfc_hbadisc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1760,6 +1760,7 @@ lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did)
		phba->brd_no,
		ndlp, ndlp->nlp_DID,
		ndlp->nlp_flag, data1);
		spin_unlock_irq(phba->host->host_lock);
		return ndlp;
		}
		}
		@@ -1805,6 +1806,7 @@ lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did)
		phba->brd_no,
		ndlp, ndlp->nlp_DID,
		ndlp->nlp_flag, data1);
		spin_unlock_irq(phba->host->host_lock);
		return ndlp;
		}
		}

Admin message