summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2008-09-06 08:39:15 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-10-03 11:46:16 -0500
commitac26d41dee65167109e7cdcd0289b44ca61cd741 (patch)
tree45f1b872cd3323fe1fbf244a85d91b8e8fd39b14 /drivers/scsi
parenta7bbb57333447d0cf950992653b6b079585f3531 (diff)
downloadlinux-ac26d41dee65167109e7cdcd0289b44ca61cd741.tar.gz
linux-ac26d41dee65167109e7cdcd0289b44ca61cd741.tar.bz2
linux-ac26d41dee65167109e7cdcd0289b44ca61cd741.zip
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libiscsi.c2
1 files changed, 1 insertions, 1 deletions
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);
}
}
}