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

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

[SCSI] iscsi bugfixes: pass errors from complete_pdu to caller 



Must pass ISCSI_ERR values from the recv path and propogate them
upwards.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent c8dc1e52

drivers/scsi/iscsi_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,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, ISCSI_ERR_CONN_FAILED);

			iscsi_conn_failure(conn, rc);

			return 0;

		}

	}

drivers/scsi/libiscsi.c

+18 −9
Original line number Diff line number Diff line
@@ -372,7 +372,8 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
			 * login related PDU's exp_statsn is handled in

			 * userspace

			 */

			rc = iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen);

			if (iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen))

				rc = ISCSI_ERR_CONN_FAILED;

			list_del(&mtask->running);

			if (conn->login_mtask != mtask)

				__kfifo_put(session->mgmtpool.queue,
@@ -393,7 +394,8 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
			}

			conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;



			rc = iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen);

			if (iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen))

				rc = ISCSI_ERR_CONN_FAILED;

			list_del(&mtask->running);

			if (conn->login_mtask != mtask)

				__kfifo_put(session->mgmtpool.queue,
@@ -406,14 +408,21 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
	} else if (itt == ISCSI_RESERVED_TAG) {

		switch(opcode) {

		case ISCSI_OP_NOOP_IN:

			if (!datalen) {

			if (datalen) {

				rc = ISCSI_ERR_PROTO;

				break;

			}



			rc = iscsi_check_assign_cmdsn(session,

						 (struct iscsi_nopin*)hdr);

				if (!rc && hdr->ttt != ISCSI_RESERVED_TAG)

					rc = iscsi_recv_pdu(conn->cls_conn,

							    hdr, NULL, 0);

			} else

				rc = ISCSI_ERR_PROTO;

			if (rc)

				break;



			if (hdr->ttt == ISCSI_RESERVED_TAG)

				break;



			if (iscsi_recv_pdu(conn->cls_conn, hdr, NULL, 0))

				rc = ISCSI_ERR_CONN_FAILED;

			break;

		case ISCSI_OP_REJECT:

			/* we need sth like iscsi_reject_rsp()*/