Commit f8dd380b authored by MengjinWu's avatar MengjinWu Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: eliminate function nvmf_tcp_set_in_capsule_data 



This function is small and called only once.

Signed-off-by: default avatarMengjinWu <mengjin.wu@intel.com>
Change-Id: Ie4b11668e42a8920b3a9a11aa8cb83512f32942c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14576


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
parent b5aeff1d

lib/nvmf/tcp.c

+11 −22
Original line number Diff line number Diff line
@@ -2555,25 +2555,6 @@ request_transfer_out(struct spdk_nvmf_request *req) 
	return 0;

}



static void

nvmf_tcp_set_in_capsule_data(struct spdk_nvmf_tcp_qpair *tqpair,

			     struct spdk_nvmf_tcp_req *tcp_req)

{

	struct nvme_tcp_pdu *pdu;

	uint32_t plen = 0;



	pdu = tqpair->pdu_in_progress;

	plen = pdu->hdr.common.hlen;



	if (tqpair->host_hdgst_enable) {

		plen += SPDK_NVME_TCP_DIGEST_LEN;

	}



	if (pdu->hdr.common.plen != plen) {

		tcp_req->has_in_capsule_data = true;

	}

}



static void

nvmf_tcp_check_fused_ordering(struct spdk_nvmf_tcp_transport *ttransport,

			      struct spdk_nvmf_tcp_qpair *tqpair,
@@ -2632,6 +2613,8 @@ nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport, 
{

	struct spdk_nvmf_tcp_qpair		*tqpair;

	int					rc;

	uint32_t				plen;

	struct nvme_tcp_pdu			*pdu;

	enum spdk_nvmf_tcp_req_state		prev_state;

	bool					progress = false;

	struct spdk_nvmf_transport		*transport = &ttransport->transport;
@@ -2696,9 +2679,15 @@ nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport, 
				break;

			}



			nvmf_tcp_set_in_capsule_data(tqpair, tcp_req);



			if (!tcp_req->has_in_capsule_data) {

			pdu = tqpair->pdu_in_progress;

			plen = pdu->hdr.common.hlen;

			if (tqpair->host_hdgst_enable) {

				plen += SPDK_NVME_TCP_DIGEST_LEN;

			}

			if (pdu->hdr.common.plen != plen) {

				tcp_req->has_in_capsule_data = true;

			} else {

				/* Data is transmitted by C2H PDUs */

				nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY);

			}