Commit 7e7ed7ec authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

scsi: move data_out_cnt to iSCSI task 



Change-Id: I550de37d5088e2273b9d53ab8a2d6134c486fba0
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent d4da7880

include/spdk/scsi.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ struct spdk_scsi_task { 


	uint32_t ref;

	uint32_t transfer_len;

	uint32_t data_out_cnt;

	uint32_t dxfer_dir;

	/* Only valid for Read/Write */

	uint32_t bytes_completed;

lib/iscsi/iscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -3495,7 +3495,7 @@ spdk_add_transfer_task(struct spdk_iscsi_conn *conn, 
	max_burst_len = conn->sess->MaxBurstLength;

	segment_len = g_spdk_iscsi.MaxRecvDataSegmentLength;

	data_out_req = 1 + (transfer_len - data_len - 1) / segment_len;

	task->scsi.data_out_cnt = data_out_req;

	task->data_out_cnt = data_out_req;



	/*

	 * If we already have too many tasks using R2T, then queue this task
@@ -3545,7 +3545,7 @@ void spdk_del_transfer_task(struct spdk_iscsi_conn *conn, uint32_t task_tag) 
		if (conn->outstanding_r2t_tasks[i]->tag == task_tag) {

			task = conn->outstanding_r2t_tasks[i];

			conn->outstanding_r2t_tasks[i] = NULL;

			conn->data_out_cnt -= task->scsi.data_out_cnt;

			conn->data_out_cnt -= task->data_out_cnt;

			found = 1;

			break;

		}
@@ -3608,7 +3608,7 @@ void spdk_clear_all_transfer_task(struct spdk_iscsi_conn *conn, 
			task->outstanding_r2t = 0;

			task->next_r2t_offset = 0;

			task->next_expected_r2t_offset = 0;

			conn->data_out_cnt -= task->scsi.data_out_cnt;

			conn->data_out_cnt -= task->data_out_cnt;

			conn->pending_r2t--;

		}

	}

lib/iscsi/task.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ struct spdk_iscsi_task { 


	uint32_t desired_data_transfer_length;



	uint32_t data_out_cnt;



	/*

	 * Tracks the current offset of large read io.

	 */