Commit 5cb60f26 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvme/tcp: change nvme_tcp_qpair_icreq_send to return void 



This improves code readability. If required can be restored later.

Change-Id: Ia549faff8aee78f4df6fd6e3ab2ae1659e4478fd
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26144


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent 88dd37b1

lib/nvme/nvme_tcp.c

+2 −7
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ nvme_tcp_qpair_sock_cb(void *ctx, struct spdk_sock_group *group, struct spdk_soc 
	}

}



static int

static void

nvme_tcp_qpair_icreq_send(struct nvme_tcp_qpair *tqpair)

{

	struct spdk_nvme_tcp_ic_req *ic_req;
@@ -2207,7 +2207,6 @@ nvme_tcp_qpair_icreq_send(struct nvme_tcp_qpair *tqpair) 


	timeout_in_sec = tqpair->qpair.async ? ICREQ_TIMEOUT_ASYNC : ICREQ_TIMEOUT_SYNC;

	tqpair->icreq_timeout_tsc = spdk_get_ticks() + (timeout_in_sec * spdk_get_ticks_hz());

	return 0;

}



static void
@@ -2435,12 +2434,8 @@ nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpa 
	if (tqpair->recv_state != NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY) {

		nvme_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY);

	}

	rc = nvme_tcp_qpair_icreq_send(tqpair);

	if (rc != 0) {

		SPDK_ERRLOG("Unable to connect the tqpair\n");

		return rc;

	}



	nvme_tcp_qpair_icreq_send(tqpair);

	return rc;

}

test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c

+1 −3
Original line number Diff line number Diff line
@@ -1096,7 +1096,6 @@ test_nvme_tcp_qpair_icreq_send(void) 
	struct nvme_tcp_pdu pdu = {};

	struct nvme_tcp_poll_group poll_group = {};

	struct spdk_nvme_tcp_ic_req *ic_req = NULL;

	int rc;



	tqpair.send_pdu = &pdu;

	tqpair.qpair.ctrlr = &ctrlr;
@@ -1109,8 +1108,7 @@ test_nvme_tcp_qpair_icreq_send(void) 
	tqpair.qpair.ctrlr->opts.data_digest = true;

	TAILQ_INIT(&tqpair.send_queue);



	rc = nvme_tcp_qpair_icreq_send(&tqpair);

	CU_ASSERT(rc == 0);

	nvme_tcp_qpair_icreq_send(&tqpair);

	CU_ASSERT(ic_req->common.hlen == sizeof(*ic_req));

	CU_ASSERT(ic_req->common.plen == sizeof(*ic_req));

	CU_ASSERT(ic_req->common.pdu_type == SPDK_NVME_TCP_PDU_TYPE_IC_REQ);