From 45f9d274389978f9e0b317ca6c36783798e35176 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Sat, 6 Sep 2008 08:39:15 -0500
Subject: [PATCH] --- yaml --- r: 110585 b: refs/heads/master c:
 ac26d41dee65167109e7cdcd0289b44ca61cd741 h: refs/heads/master i:   110583:
 be847e0968c810d289c290a2d47e95adbb473e96 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/libiscsi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 04e9189a9663..e4d7fc3f3650 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7bbb57333447d0cf950992653b6b079585f3531
+refs/heads/master: ac26d41dee65167109e7cdcd0289b44ca61cd741
diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c
index 299e075a7b34..0b7457d558f7 100644
--- a/trunk/drivers/scsi/libiscsi.c
+++ b/trunk/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);
 		}
 	}
 }