diff options
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 1067d77da10e..49d6dd5572cb 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -687,7 +687,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn) | |||
687 | switch(conn->in.opcode) { | 687 | switch(conn->in.opcode) { |
688 | case ISCSI_OP_LOGIN_RSP: | 688 | case ISCSI_OP_LOGIN_RSP: |
689 | case ISCSI_OP_TEXT_RSP: | 689 | case ISCSI_OP_TEXT_RSP: |
690 | case ISCSI_OP_LOGOUT_RSP: | 690 | case ISCSI_OP_LOGOUT_RSP: |
691 | rc = iscsi_check_assign_cmdsn(session, | 691 | rc = iscsi_check_assign_cmdsn(session, |
692 | (struct iscsi_nopin*)hdr); | 692 | (struct iscsi_nopin*)hdr); |
693 | if (rc) | 693 | if (rc) |
@@ -728,12 +728,12 @@ iscsi_hdr_recv(struct iscsi_conn *conn) | |||
728 | } | 728 | } |
729 | spin_unlock(&session->lock); | 729 | spin_unlock(&session->lock); |
730 | break; | 730 | break; |
731 | case ISCSI_OP_NOOP_IN: | 731 | case ISCSI_OP_NOOP_IN: |
732 | if (hdr->ttt != ISCSI_RESERVED_TAG) { | 732 | if (hdr->ttt != ISCSI_RESERVED_TAG) { |
733 | rc = ISCSI_ERR_PROTO; | 733 | rc = ISCSI_ERR_PROTO; |
734 | break; | 734 | break; |
735 | } | 735 | } |
736 | rc = iscsi_check_assign_cmdsn(session, | 736 | rc = iscsi_check_assign_cmdsn(session, |
737 | (struct iscsi_nopin*)hdr); | 737 | (struct iscsi_nopin*)hdr); |
738 | if (rc) | 738 | if (rc) |
739 | break; | 739 | break; |
@@ -768,7 +768,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn) | |||
768 | if (!rc && hdr->ttt != ISCSI_RESERVED_TAG) | 768 | if (!rc && hdr->ttt != ISCSI_RESERVED_TAG) |
769 | rc = iscsi_recv_pdu(iscsi_handle(conn), | 769 | rc = iscsi_recv_pdu(iscsi_handle(conn), |
770 | hdr, NULL, 0); | 770 | hdr, NULL, 0); |
771 | } else | 771 | } else |
772 | rc = ISCSI_ERR_PROTO; | 772 | rc = ISCSI_ERR_PROTO; |
773 | break; | 773 | break; |
774 | case ISCSI_OP_REJECT: | 774 | case ISCSI_OP_REJECT: |
@@ -930,7 +930,7 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn) | |||
930 | sc->request_bufflen, ctask->data_offset); | 930 | sc->request_bufflen, ctask->data_offset); |
931 | if (rc == -EAGAIN) | 931 | if (rc == -EAGAIN) |
932 | return rc; | 932 | return rc; |
933 | if (conn->datadgst_en) | 933 | if (conn->datadgst_en) |
934 | iscsi_recv_digest_update(conn, sc->request_buffer, i); | 934 | iscsi_recv_digest_update(conn, sc->request_buffer, i); |
935 | rc = 0; | 935 | rc = 0; |
936 | goto done; | 936 | goto done; |
@@ -1025,7 +1025,7 @@ iscsi_data_recv(struct iscsi_conn *conn) | |||
1025 | conn->in.hdr = &conn->hdr; | 1025 | conn->in.hdr = &conn->hdr; |
1026 | conn->senselen = (conn->data[0] << 8) | conn->data[1]; | 1026 | conn->senselen = (conn->data[0] << 8) | conn->data[1]; |
1027 | rc = iscsi_cmd_rsp(conn, conn->in.ctask); | 1027 | rc = iscsi_cmd_rsp(conn, conn->in.ctask); |
1028 | if (!rc && conn->datadgst_en) | 1028 | if (!rc && conn->datadgst_en) |
1029 | iscsi_recv_digest_update(conn, conn->data, | 1029 | iscsi_recv_digest_update(conn, conn->data, |
1030 | conn->in.datalen); | 1030 | conn->in.datalen); |
1031 | } | 1031 | } |
@@ -1052,7 +1052,7 @@ iscsi_data_recv(struct iscsi_conn *conn) | |||
1052 | rc = iscsi_recv_pdu(iscsi_handle(conn), conn->in.hdr, | 1052 | rc = iscsi_recv_pdu(iscsi_handle(conn), conn->in.hdr, |
1053 | conn->data, conn->in.datalen); | 1053 | conn->data, conn->in.datalen); |
1054 | 1054 | ||
1055 | if (!rc && conn->datadgst_en && | 1055 | if (!rc && conn->datadgst_en && |
1056 | conn->in.opcode != ISCSI_OP_LOGIN_RSP) | 1056 | conn->in.opcode != ISCSI_OP_LOGIN_RSP) |
1057 | iscsi_recv_digest_update(conn, conn->data, | 1057 | iscsi_recv_digest_update(conn, conn->data, |
1058 | conn->in.datalen); | 1058 | conn->in.datalen); |
@@ -1681,7 +1681,7 @@ iscsi_cmd_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask, | |||
1681 | zero_data(ctask->hdr.dlength); | 1681 | zero_data(ctask->hdr.dlength); |
1682 | } | 1682 | } |
1683 | 1683 | ||
1684 | iscsi_buf_init_virt(&ctask->headbuf, (char*)&ctask->hdr, | 1684 | iscsi_buf_init_virt(&ctask->headbuf, (char*)&ctask->hdr, |
1685 | sizeof(struct iscsi_hdr)); | 1685 | sizeof(struct iscsi_hdr)); |
1686 | conn->scsicmd_pdus_cnt++; | 1686 | conn->scsicmd_pdus_cnt++; |
1687 | } | 1687 | } |
@@ -1747,7 +1747,7 @@ static inline int | |||
1747 | handle_xmstate_r_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) | 1747 | handle_xmstate_r_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) |
1748 | { | 1748 | { |
1749 | ctask->xmstate &= ~XMSTATE_R_HDR; | 1749 | ctask->xmstate &= ~XMSTATE_R_HDR; |
1750 | if (conn->hdrdgst_en) | 1750 | if (conn->hdrdgst_en) |
1751 | iscsi_hdr_digest(conn, &ctask->headbuf, (u8*)ctask->hdrext); | 1751 | iscsi_hdr_digest(conn, &ctask->headbuf, (u8*)ctask->hdrext); |
1752 | if (!iscsi_sendhdr(conn, &ctask->headbuf, 0)) { | 1752 | if (!iscsi_sendhdr(conn, &ctask->headbuf, 0)) { |
1753 | BUG_ON(ctask->xmstate != XMSTATE_IDLE); | 1753 | BUG_ON(ctask->xmstate != XMSTATE_IDLE); |
@@ -1761,7 +1761,7 @@ static inline int | |||
1761 | handle_xmstate_w_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) | 1761 | handle_xmstate_w_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) |
1762 | { | 1762 | { |
1763 | ctask->xmstate &= ~XMSTATE_W_HDR; | 1763 | ctask->xmstate &= ~XMSTATE_W_HDR; |
1764 | if (conn->hdrdgst_en) | 1764 | if (conn->hdrdgst_en) |
1765 | iscsi_hdr_digest(conn, &ctask->headbuf, (u8*)ctask->hdrext); | 1765 | iscsi_hdr_digest(conn, &ctask->headbuf, (u8*)ctask->hdrext); |
1766 | if (iscsi_sendhdr(conn, &ctask->headbuf, ctask->imm_count)) { | 1766 | if (iscsi_sendhdr(conn, &ctask->headbuf, ctask->imm_count)) { |
1767 | ctask->xmstate |= XMSTATE_W_HDR; | 1767 | ctask->xmstate |= XMSTATE_W_HDR; |
@@ -2149,7 +2149,7 @@ unsolicit_head_again: | |||
2149 | solicit_head_again: | 2149 | solicit_head_again: |
2150 | r2t = ctask->r2t; | 2150 | r2t = ctask->r2t; |
2151 | if (conn->hdrdgst_en) | 2151 | if (conn->hdrdgst_en) |
2152 | iscsi_hdr_digest(conn, &r2t->headbuf, | 2152 | iscsi_hdr_digest(conn, &r2t->headbuf, |
2153 | (u8*)r2t->dtask->hdrext); | 2153 | (u8*)r2t->dtask->hdrext); |
2154 | if (iscsi_sendhdr(conn, &r2t->headbuf, r2t->data_count)) { | 2154 | if (iscsi_sendhdr(conn, &r2t->headbuf, r2t->data_count)) { |
2155 | ctask->xmstate &= ~XMSTATE_SOL_DATA; | 2155 | ctask->xmstate &= ~XMSTATE_SOL_DATA; |