Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d82967c7 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[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: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 8d4fbd3f

drivers/scsi/iscsi_tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ iscsi_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, 
		       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 @@ iscsi_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, 
			}

			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 @@ iscsi_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, 
		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;