Commit 4c8ccb54 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

nvme: Remove poll_group_disconnect_qpair() call from poll_group_remove() 



spdk_nvme_poll_group_remove() is available only for disconnected
qpairs now. Hence spdk_nvme_poll_group_remove() does not have to
check if qpair is connected and call nvme_ctrlr_disconnect_qpair().

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I3b05246c4be6adfa3392b8f0e5ecaf274a8a7795
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10846


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarMonica Kenguva <monica.kenguva@intel.com>
parent ea2db5bb

lib/nvme/nvme_rdma.c

+1 −3
Original line number Diff line number Diff line
@@ -2686,9 +2686,7 @@ static int 
nvme_rdma_poll_group_remove(struct spdk_nvme_transport_poll_group *tgroup,

			    struct spdk_nvme_qpair *qpair)

{

	if (qpair->poll_group_tailq_head == &tgroup->connected_qpairs) {

		return nvme_poll_group_disconnect_qpair(qpair);

	}

	assert(qpair->poll_group_tailq_head == &tgroup->disconnected_qpairs);



	return 0;

}

lib/nvme/nvme_tcp.c

+2 −5
Original line number Diff line number Diff line
@@ -2284,18 +2284,15 @@ nvme_tcp_poll_group_remove(struct spdk_nvme_transport_poll_group *tgroup, 
			   struct spdk_nvme_qpair *qpair)

{

	struct nvme_tcp_qpair *tqpair;

	int rc = 0;



	if (qpair->poll_group_tailq_head == &tgroup->connected_qpairs) {

		rc = nvme_poll_group_disconnect_qpair(qpair);

	}

	assert(qpair->poll_group_tailq_head == &tgroup->disconnected_qpairs);



	tqpair = nvme_tcp_qpair(qpair);



	assert(tqpair->shared_stats == true);

	tqpair->stats = &g_dummy_stats;



	return rc;

	return 0;

}



static int64_t