aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2006-07-24 16:47:11 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-07-28 12:47:23 -0400
commitd82967c70658a408ea6cae5dc989ba8b2c0999e1 (patch)
tree0ea99ac94283f01d14e40272fb403935533f15d4 /drivers
parent8d4fbd3f978ba49498dc7c6430368c4ff86a09fc (diff)
[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>
Diffstat (limited to 'drivers')
-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:
843 if (rc == -EAGAIN) 843 if (rc == -EAGAIN)
844 goto nomore; 844 goto nomore;
845 else { 845 else {
846 iscsi_conn_failure(conn, rc); 846 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
847 return 0; 847 return 0;
848 } 848 }
849 } 849 }
@@ -859,7 +859,7 @@ more:
859 } 859 }
860 tcp_conn->in_progress = IN_PROGRESS_DATA_RECV; 860 tcp_conn->in_progress = IN_PROGRESS_DATA_RECV;
861 } else if (rc) { 861 } else if (rc) {
862 iscsi_conn_failure(conn, rc); 862 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
863 return 0; 863 return 0;
864 } 864 }
865 } 865 }
@@ -897,7 +897,7 @@ more:
897 if (rc) { 897 if (rc) {
898 if (rc == -EAGAIN) 898 if (rc == -EAGAIN)
899 goto again; 899 goto again;
900 iscsi_conn_failure(conn, rc); 900 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
901 return 0; 901 return 0;
902 } 902 }
903 tcp_conn->in.copy -= tcp_conn->in.padding; 903 tcp_conn->in.copy -= tcp_conn->in.padding;