3 files changed, 9 insertions, 7 deletions

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 521dbf7e521d..0e8f26baca6e 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1200,7 +1200,7 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
                         goto reject;
                 case ISCSI_STATE_RECOVERY_FAILED:
                         reason = FAILURE_SESSION_RECOVERY_TIMEOUT;
-                        sc->result = DID_NO_CONNECT << 16;
+                        sc->result = DID_TRANSPORT_FAILFAST << 16;
                         break;
                 case ISCSI_STATE_TERMINATE:
                         reason = FAILURE_SESSION_TERMINATE;
@@ -2333,8 +2333,10 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
          * flush queues.
          */
         spin_lock_bh(&session->lock);
-        fail_all_commands(conn, -1,
-                        STOP_CONN_RECOVER ? DID_BUS_BUSY : DID_ERROR);
+        if (STOP_CONN_RECOVER)
+                fail_all_commands(conn, -1, DID_TRANSPORT_DISRUPTED);
+        else
+                fail_all_commands(conn, -1, DID_ERROR);
         flush_control_queues(session, conn);
         spin_unlock_bh(&session->lock);
         mutex_unlock(&session->eh_mutex);
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index a91a57c57bff..799120fcb9be 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -139,7 +139,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
                               ha->host_no, cmd->device->channel,
                               cmd->device->id, cmd->device->lun));
 
-                cmd->result = DID_BUS_BUSY << 16;
+                cmd->result = DID_TRANSPORT_DISRUPTED << 16;
 
                 /*
                  * Mark device missing so that we won't continue to send
@@ -243,7 +243,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
                 if (atomic_read(&ddb_entry->state) == DDB_STATE_ONLINE)
                         qla4xxx_mark_device_missing(ha, ddb_entry);
 
-                cmd->result = DID_BUS_BUSY << 16;
+                cmd->result = DID_TRANSPORT_DISRUPTED << 16;
                 break;
 
         case SCS_QUEUE_FULL:
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 0ce5f7cdfe2a..cbaae48f47ed 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -374,10 +374,10 @@ int iscsi_session_chkready(struct iscsi_cls_session *session)
                 err = 0;
                 break;
         case ISCSI_SESSION_FAILED:
-                err = DID_IMM_RETRY << 16;
+                err = DID_TRANSPORT_DISRUPTED << 16;
                 break;
         case ISCSI_SESSION_FREE:
-                err = DID_NO_CONNECT << 16;
+                err = DID_TRANSPORT_FAILFAST << 16;
                 break;
         default:
                 err = DID_NO_CONNECT << 16;