Commit 527be2bf authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

nvmf: Remove qpair_is_idle 



This wasn't used anywhere.

Change-Id: I405af3c808be284d19218f3f04c1e90e33e31de8
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446977


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 <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
parent ed0b611f

lib/nvmf/rdma.c

+0 −14
Original line number Diff line number Diff line
@@ -2204,19 +2204,6 @@ spdk_nvmf_rdma_stop_listen(struct spdk_nvmf_transport *transport, 
	return 0;

}



static bool

spdk_nvmf_rdma_qpair_is_idle(struct spdk_nvmf_qpair *qpair)

{

	struct spdk_nvmf_rdma_qpair *rqpair;



	rqpair = SPDK_CONTAINEROF(qpair, struct spdk_nvmf_rdma_qpair, qpair);



	if (rqpair->qd == 0) {

		return true;

	}

	return false;

}



static void

spdk_nvmf_rdma_qpair_process_pending(struct spdk_nvmf_rdma_transport *rtransport,

				     struct spdk_nvmf_rdma_qpair *rqpair, bool drain)
@@ -3315,7 +3302,6 @@ const struct spdk_nvmf_transport_ops spdk_nvmf_transport_rdma = { 
	.req_complete = spdk_nvmf_rdma_request_complete,



	.qpair_fini = spdk_nvmf_rdma_close_qpair,

	.qpair_is_idle = spdk_nvmf_rdma_qpair_is_idle,

	.qpair_get_peer_trid = spdk_nvmf_rdma_qpair_get_peer_trid,

	.qpair_get_local_trid = spdk_nvmf_rdma_qpair_get_local_trid,

	.qpair_get_listen_trid = spdk_nvmf_rdma_qpair_get_listen_trid,

lib/nvmf/tcp.c

+0 −14
Original line number Diff line number Diff line
@@ -2712,19 +2712,6 @@ spdk_nvmf_tcp_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) 
	return 0;

}



static bool

spdk_nvmf_tcp_qpair_is_idle(struct spdk_nvmf_qpair *qpair)

{

	struct spdk_nvmf_tcp_qpair *tqpair;



	tqpair = SPDK_CONTAINEROF(qpair, struct spdk_nvmf_tcp_qpair, qpair);

	if (tqpair->state_cntr[TCP_REQUEST_STATE_FREE] == tqpair->max_queue_depth) {

		return true;

	}



	return false;

}



static int

spdk_nvmf_tcp_qpair_get_trid(struct spdk_nvmf_qpair *qpair,

			     struct spdk_nvme_transport_id *trid, bool peer)
@@ -2840,7 +2827,6 @@ const struct spdk_nvmf_transport_ops spdk_nvmf_transport_tcp = { 
	.req_complete = spdk_nvmf_tcp_req_complete,



	.qpair_fini = spdk_nvmf_tcp_close_qpair,

	.qpair_is_idle = spdk_nvmf_tcp_qpair_is_idle,

	.qpair_get_local_trid = spdk_nvmf_tcp_qpair_get_local_trid,

	.qpair_get_peer_trid = spdk_nvmf_tcp_qpair_get_peer_trid,

	.qpair_get_listen_trid = spdk_nvmf_tcp_qpair_get_listen_trid,

lib/nvmf/transport.c

+0 −6
Original line number Diff line number Diff line
@@ -288,12 +288,6 @@ spdk_nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair) 
	qpair->transport->ops->qpair_fini(qpair);

}



bool

spdk_nvmf_transport_qpair_is_idle(struct spdk_nvmf_qpair *qpair)

{

	return qpair->transport->ops->qpair_is_idle(qpair);

}



int

spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,

					struct spdk_nvme_transport_id *trid)

lib/nvmf/transport.h

+0 −7
Original line number Diff line number Diff line
@@ -140,11 +140,6 @@ struct spdk_nvmf_transport_ops { 
	 */

	void (*qpair_fini)(struct spdk_nvmf_qpair *qpair);



	/*

	 * True if the qpair has no pending IO.

	 */

	bool (*qpair_is_idle)(struct spdk_nvmf_qpair *qpair);



	/*

	 * Get the peer transport ID for the queue pair.

	 */
@@ -198,8 +193,6 @@ int spdk_nvmf_transport_req_complete(struct spdk_nvmf_request *req); 


void spdk_nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair);



bool spdk_nvmf_transport_qpair_is_idle(struct spdk_nvmf_qpair *qpair);



int spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,

		struct spdk_nvme_transport_id *trid);

test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c

+0 −6
Original line number Diff line number Diff line
@@ -135,12 +135,6 @@ spdk_nvmf_tgt_get_transport(struct spdk_nvmf_tgt *tgt, enum spdk_nvme_transport_ 
	return &g_transport;

}



bool

spdk_nvmf_transport_qpair_is_idle(struct spdk_nvmf_qpair *qpair)

{

	return false;

}



int

spdk_nvme_transport_id_parse_trtype(enum spdk_nvme_transport_type *trtype, const char *str)

{