Commit 5ea834b5 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

iscsi: Update task->current_data_offset always when submitting subtask 



Previously task->current_data_offset was updated by add_transfer_task().
However, the following patches will merge unsolicited data and solicited
data into a single subtask. It will be possible that add_transfer_task()
is called but subtask is not submitted. As a preparation, extract
updating task->current_data_offset into iscsi_pdu_payload_op_scsi_write().

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I5262bb883fa2a081be1f087181de98d4c3c24d69
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9706


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent fe08d837

lib/iscsi/iscsi.c

+2 −1
Original line number Diff line number Diff line
@@ -2761,7 +2761,6 @@ add_transfer_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task) 
	conn->pending_r2t++;



	task->next_expected_r2t_offset = data_len;

	task->current_data_offset = data_len;

	task->current_r2t_length = 0;

	task->R2TSN = 0;

	/* According to RFC3720 10.8.5, 0xffffffff is
@@ -3326,6 +3325,8 @@ iscsi_pdu_payload_op_scsi_write(struct spdk_iscsi_conn *conn, struct spdk_iscsi_ 
			subtask->scsi.length = pdu->data_segment_len;

			iscsi_task_associate_pdu(subtask, pdu);



			task->current_data_offset = pdu->data_segment_len;



			iscsi_queue_task(conn, subtask);

		}

		return 0;