From: Mike Christie <michaelc@cs.wisc.edu>
Date: Sat, 6 Sep 2008 13:39:15 +0000 (-0500)
Subject: [SCSI] libiscsi: return error passed in during iscsi recovery
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ac26d41dee65167109e7cdcd0289b44ca61cd741;p=deliverable%2Flinux.git

[SCSI] libiscsi: return error passed in during iscsi recovery

Due to patch building error on my side, we are still passing DID_BUS_BUSY
for commands that are running, when we want to return whatever the caller
of fail_all_commands wanted. This replaces the hardcoded error code with
the value that is passed in.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 299e075a7b34..0b7457d558f7 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1456,7 +1456,7 @@ static void fail_all_commands(struct iscsi_conn *conn, unsigned lun,
 		if (lun == task->sc->device->lun || lun == -1) {
 			debug_scsi("failing in progress sc %p itt 0x%x\n",
 				   task->sc, task->itt);
-			fail_command(conn, task, DID_BUS_BUSY << 16);
+			fail_command(conn, task, error << 16);
 		}
 	}
 }