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

lib/iscsi: Separate allocating data buffer and reading PDU payload 



When we introduce state machine, allocating data buffer and reading
PDU payload will be done in the different state. Hence separate
them into the different code block.

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


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 af8f50e9

lib/iscsi/iscsi.c

+23 −23
Original line number Diff line number Diff line
@@ -4684,9 +4684,7 @@ 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) {

	if (data_len != 0 && pdu->data_buf == NULL) {

		if (data_len <= spdk_get_max_immediate_data_size()) {

			pool = g_spdk_iscsi.pdu_immediate_data_pool;

			pdu->data_buf_len = SPDK_BDEV_BUF_SIZE_WITH_MD(spdk_get_max_immediate_data_size());
@@ -4710,6 +4708,8 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu) 
		}

	}



	/* copy the actual data into local buffer */

	if (pdu->data_valid_bytes < data_len) {

		rc = iscsi_conn_read_data_segment(conn, pdu, data_len);

		if (rc < 0) {

			goto error;