2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 7551abe40900..3eddab0774e4 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1796,9 +1796,9 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,
                                       NULL, 0);
         if (!task) {
                 spin_unlock_bh(&session->lock);
+                iscsi_conn_printk(KERN_ERR, conn, "Could not send TMF.\n");
                 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
                 spin_lock_bh(&session->lock);
-                ISCSI_DBG_EH(session, "tmf exec failure\n");
                 return -EPERM;
         }
         conn->tmfcmd_pdus_cnt++;
@@ -2203,7 +2203,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
                 goto success_unlocked;
         case TMF_TIMEDOUT:
                 spin_unlock_bh(&session->lock);
-                iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
                 goto failed_unlocked;
         case TMF_NOT_FOUND:
                 if (!sc->SCp.ptr) {
@@ -2290,7 +2290,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
                 break;
         case TMF_TIMEDOUT:
                 spin_unlock_bh(&session->lock);
-                iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
                 goto done;
         default:
                 conn->tmf_state = TMF_INITIAL;
@@ -2371,7 +2371,7 @@ failed:
          * we drop the lock here but the leadconn cannot be destoyed while
          * we are in the scsi eh
          */
-        iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+        iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
 
         ISCSI_DBG_EH(session, "wait for relogin\n");
         wait_event_interruptible(conn->ehwait,
@@ -2453,7 +2453,7 @@ int iscsi_eh_target_reset(struct scsi_cmnd *sc)
                 break;
         case TMF_TIMEDOUT:
                 spin_unlock_bh(&session->lock);
-                iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
                 goto done;
         default:
                 conn->tmf_state = TMF_INITIAL;
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index a8631acd37c3..c3e1cbcc2ad2 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -263,6 +263,7 @@ enum iscsi_err {
         ISCSI_ERR_INVALID_HOST          = ISCSI_ERR_BASE + 18,
         ISCSI_ERR_XMIT_FAILED           = ISCSI_ERR_BASE + 19,
         ISCSI_ERR_TCP_CONN_CLOSE        = ISCSI_ERR_BASE + 20,
+        ISCSI_ERR_SCSI_EH_SESSION_RST   = ISCSI_ERR_BASE + 21,
 };
 
 /*