diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/libiscsi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 2865ebd557e..5d886218948 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
@@ -975,13 +975,13 @@ int iscsi_eh_host_reset(struct scsi_cmnd *sc) | |||
975 | if (session->state == ISCSI_STATE_TERMINATE) { | 975 | if (session->state == ISCSI_STATE_TERMINATE) { |
976 | failed: | 976 | failed: |
977 | debug_scsi("failing host reset: session terminated " | 977 | debug_scsi("failing host reset: session terminated " |
978 | "[CID %d age %d]", conn->id, session->age); | 978 | "[CID %d age %d]\n", conn->id, session->age); |
979 | spin_unlock_bh(&session->lock); | 979 | spin_unlock_bh(&session->lock); |
980 | return FAILED; | 980 | return FAILED; |
981 | } | 981 | } |
982 | 982 | ||
983 | if (sc->SCp.phase == session->age) { | 983 | if (sc->SCp.phase == session->age) { |
984 | debug_scsi("failing connection CID %d due to SCSI host reset", | 984 | debug_scsi("failing connection CID %d due to SCSI host reset\n", |
985 | conn->id); | 985 | conn->id); |
986 | fail_session = 1; | 986 | fail_session = 1; |
987 | } | 987 | } |
@@ -1054,7 +1054,8 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc, | |||
1054 | NULL, 0); | 1054 | NULL, 0); |
1055 | if (rc) { | 1055 | if (rc) { |
1056 | iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED); | 1056 | iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED); |
1057 | debug_scsi("abort sent failure [itt 0x%x] %d", ctask->itt, rc); | 1057 | debug_scsi("abort sent failure [itt 0x%x] %d\n", ctask->itt, |
1058 | rc); | ||
1058 | return rc; | 1059 | return rc; |
1059 | } | 1060 | } |
1060 | 1061 | ||
@@ -1071,7 +1072,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc, | |||
1071 | conn->tmabort_timer.function = iscsi_tmabort_timedout; | 1072 | conn->tmabort_timer.function = iscsi_tmabort_timedout; |
1072 | conn->tmabort_timer.data = (unsigned long)ctask; | 1073 | conn->tmabort_timer.data = (unsigned long)ctask; |
1073 | add_timer(&conn->tmabort_timer); | 1074 | add_timer(&conn->tmabort_timer); |
1074 | debug_scsi("abort set timeout [itt 0x%x]", ctask->itt); | 1075 | debug_scsi("abort set timeout [itt 0x%x]\n", ctask->itt); |
1075 | } | 1076 | } |
1076 | spin_unlock_bh(&session->lock); | 1077 | spin_unlock_bh(&session->lock); |
1077 | mutex_unlock(&conn->xmitmutex); | 1078 | mutex_unlock(&conn->xmitmutex); |