Commit af8f50e9 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Changpeng Liu
Browse files

lib/iscsi: Move getting data length down in spdk_iscsi_read_pdu() 



The subsequent patches will separate handling header and payload.
Move getting data_len down because data_len is for payload.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 44737323

lib/iscsi/iscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -4649,8 +4649,6 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu) 
		}

	}



	data_len = ISCSI_ALIGN(DGET24(pdu->bhs.data_segment_len));



	/* AHS */

	ahs_len = pdu->bhs.total_ahs_len * 4;

	assert(ahs_len <= ISCSI_AHS_LEN);
@@ -4684,6 +4682,8 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu) 
		}

	}



	data_len = ISCSI_ALIGN(DGET24(pdu->bhs.data_segment_len));



	/* copy the actual data into local buffer */

	if (pdu->data_valid_bytes < data_len) {

		if (pdu->data_buf == NULL) {