From: James Smart <james.smart@emulex.com>
Date: Tue, 12 Jun 2012 17:54:59 +0000 (-0400)
Subject: [SCSI] lpfc 8.3.32: Fix system panic due to node state change
X-Git-Tag: v3.6-rc1~103^2~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b415f5d6c05eb7f4808e98baf539c5dbc53cdbc;p=profile%2Fivi%2Fkernel-x86-ivi.git

[SCSI] lpfc 8.3.32: Fix system panic due to node state change

Fix System Panic During IO Test using Medusa tool

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 169b77b..925975d 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4275,10 +4275,8 @@ lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
 	 * Catch race where our node has transitioned, but the
 	 * transport is still transitioning.
 	 */
-	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {
-		cmnd->result = ScsiResult(DID_IMM_RETRY, 0);
-		goto out_fail_command;
-	}
+	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))
+		goto out_tgt_busy;
 	if (atomic_read(&ndlp->cmd_pending) >= ndlp->cmd_qdepth)
 		goto out_tgt_busy;