From a5b4d889bf0b12f40d4b686a38fa65d4239f4d57 Mon Sep 17 00:00:00 2001
From: James Smart <james.smart@emulex.com>
Date: Tue, 12 Jun 2012 13:54:59 -0400
Subject: [PATCH] --- yaml --- r: 316773 b: refs/heads/master c:
 6b415f5d6c05eb7f4808e98baf539c5dbc53cdbc h: refs/heads/master i:   316771:
 aea3b4944393994a54e770bcbd0244d247a449de v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/lpfc/lpfc_scsi.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d7e27744a861..abb9b065d5dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 173edbb2c326ce4839bae8caa868fe83ce46dda3
+refs/heads/master: 6b415f5d6c05eb7f4808e98baf539c5dbc53cdbc
diff --git a/trunk/drivers/scsi/lpfc/lpfc_scsi.c b/trunk/drivers/scsi/lpfc/lpfc_scsi.c
index 169b77b82b48..925975d2d765 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/trunk/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;