Commit d4da7880 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

scsi: move desired_data_transfer_length to iSCSI task 



Change-Id: I425f9cc7c572b4d819d0aae370f7a96c57d6eac1
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 414b7545

include/spdk/scsi.h

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ struct spdk_scsi_task { 
	uint32_t transfer_len;

	uint32_t data_out_cnt;

	uint32_t dxfer_dir;

	uint32_t desired_data_transfer_length;

	/* Only valid for Read/Write */

	uint32_t bytes_completed;

	uint32_t length;

lib/iscsi/iscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -4063,7 +4063,7 @@ static int spdk_iscsi_op_data(struct spdk_iscsi_conn *conn, 
		goto reject_return;

	}



	if (pdu->data_segment_len > task->scsi.desired_data_transfer_length) {

	if (pdu->data_segment_len > task->desired_data_transfer_length) {

		SPDK_ERRLOG("the dataout pdu data length is larger than the value sent by R2T PDU");

		return SPDK_ISCSI_CONNECTION_FATAL;

	}
@@ -4181,7 +4181,7 @@ spdk_iscsi_send_r2t(struct spdk_iscsi_conn *conn, 


	to_be32(&rsph->buffer_offset, (uint32_t)offset);

	to_be32(&rsph->desired_xfer_len, (uint32_t)len);

	task->scsi.desired_data_transfer_length = (size_t)len;

	task->desired_data_transfer_length = (size_t)len;



	/* we need to hold onto this task/cmd because until the PDU has been

	 * written out */

lib/iscsi/task.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ struct spdk_iscsi_task { 
	struct spdk_iscsi_pdu *pdu;

	uint32_t outstanding_r2t;



	uint32_t desired_data_transfer_length;



	/*

	 * Tracks the current offset of large read io.

	 */