sugar/linux
1
0
Fork 0
Code Activity

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

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

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Mike Christie
2006-07-24 15:47:45 -05:00
committed by James Bottomley
parent c8dc1e523b
commit 40527afea1
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/iscsi_tcp.c
View File

@@ -885,7 +885,7 @@ more:
} }
tcp_conn->in_progress = IN_PROGRESS_DATA_RECV; tcp_conn->in_progress = IN_PROGRESS_DATA_RECV;
} else if (rc) { } else if (rc) {
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED); iscsi_conn_failure(conn, rc);
return 0; return 0;
} }
} }

27
drivers/scsi/libiscsi.c
View File

@@ -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 * login related PDU's exp_statsn is handled in
* userspace * 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); list_del(&mtask->running);
if (conn->login_mtask != mtask) if (conn->login_mtask != mtask)
__kfifo_put(session->mgmtpool.queue, __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; 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); list_del(&mtask->running);
if (conn->login_mtask != mtask) if (conn->login_mtask != mtask)
__kfifo_put(session->mgmtpool.queue, __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) { } else if (itt == ISCSI_RESERVED_TAG) {
switch(opcode) { switch(opcode) {
case ISCSI_OP_NOOP_IN: case ISCSI_OP_NOOP_IN:
if (!datalen) { if (datalen) {
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; rc = ISCSI_ERR_PROTO;
break;
}
rc = iscsi_check_assign_cmdsn(session,
(struct iscsi_nopin*)hdr);
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; break;
case ISCSI_OP_REJECT: case ISCSI_OP_REJECT:
/* we need sth like iscsi_reject_rsp()*/ /* we need sth like iscsi_reject_rsp()*/