aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2006-07-24 15:47:11 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-07-28 11:47:23 -0500
commitd82967c70658a408ea6cae5dc989ba8b2c0999e1 (patch)
tree0ea99ac94283f01d14e40272fb403935533f15d4
parent[SCSI] hptiop: wrong register used in hptiop_reset_hba() (diff)
downloadlinux-dev-d82967c70658a408ea6cae5dc989ba8b2c0999e1.tar.xz
linux-dev-d82967c70658a408ea6cae5dc989ba8b2c0999e1.zip
[SCSI] iscsi bugfixes: send correct error values to userspace
In the xmit patch we are sending a -EXXX value to iscsi_conn_failure which is causing userspace to get confused. We should be sending a ISCSI_ERR_* value that userspace understands. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/iscsi_tcp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 848fb2aa4ca3..88dafdf45c47 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -843,7 +843,7 @@ more:
if (rc == -EAGAIN)
goto nomore;
else {
- iscsi_conn_failure(conn, rc);
+ iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
return 0;
}
}
@@ -859,7 +859,7 @@ more:
}
tcp_conn->in_progress = IN_PROGRESS_DATA_RECV;
} else if (rc) {
- iscsi_conn_failure(conn, rc);
+ iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
return 0;
}
}
@@ -897,7 +897,7 @@ more:
if (rc) {
if (rc == -EAGAIN)
goto again;
- iscsi_conn_failure(conn, rc);
+ iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
return 0;
}
tcp_conn->in.copy -= tcp_conn->in.padding;