diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2014-07-12 15:51:51 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-08-01 08:16:39 -0400 |
| commit | 09ff742c62a6bbfca7aed485f44c8b16f52e1096 (patch) | |
| tree | 67555350fbf93d90442dfa3781457d610f12970e | |
| parent | 719e5874d0777b575720249d3ece3dbde3efb452 (diff) | |
| download | op-kernel-dev-09ff742c62a6bbfca7aed485f44c8b16f52e1096.zip op-kernel-dev-09ff742c62a6bbfca7aed485f44c8b16f52e1096.tar.gz | |
libiscsi: return new error code when nop times out
When a iscsi nop as ping timedout we were failing with the
common connection error code, ISCSI_ERR_CONN_FAILED. This
patch adds a new error code for this problem so can properly
track/distinguish in userspace.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/scsi/libiscsi.c | 2 | ||||
| -rw-r--r-- | include/scsi/iscsi_if.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index f9f3a12..ea025e4 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -2097,7 +2097,7 @@ static void iscsi_check_transport_timeouts(unsigned long data) conn->ping_timeout, conn->recv_timeout, last_recv, conn->last_ping, jiffies); spin_unlock(&session->frwd_lock); - iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED); + iscsi_conn_failure(conn, ISCSI_ERR_NOP_TIMEDOUT); return; } diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index fd0421c..95ed942 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h @@ -527,6 +527,7 @@ enum iscsi_err { 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, + ISCSI_ERR_NOP_TIMEDOUT = ISCSI_ERR_BASE + 22, }; /* |
