diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 7d912a48f..6f87f93c8 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -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, diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index fee21cd46..4ce313562 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -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, diff --git a/lib/nvmf/transport.c b/lib/nvmf/transport.c index 7c8e193fa..2b7782d40 100644 --- a/lib/nvmf/transport.c +++ b/lib/nvmf/transport.c @@ -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) diff --git a/lib/nvmf/transport.h b/lib/nvmf/transport.h index dca15231b..aaecff104 100644 --- a/lib/nvmf/transport.h +++ b/lib/nvmf/transport.h @@ -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); diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c index 1c04e9f93..33d9fa7a6 100644 --- a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c +++ b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c @@ -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) { diff --git a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c index efaf63ede..c276cdf3a 100644 --- a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c +++ b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c @@ -96,12 +96,6 @@ spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, entry->trtype = 42; } -bool -spdk_nvmf_transport_qpair_is_idle(struct spdk_nvmf_qpair *qpair) -{ - return false; -} - static struct spdk_nvmf_transport g_transport = {}; struct spdk_nvmf_transport * diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c index 7b4ea75e9..ae83aa648 100644 --- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c +++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c @@ -359,32 +359,6 @@ test_nvmf_tcp_poll_group_create(void) spdk_thread_exit(thread); } -static void -test_nvmf_tcp_qpair_is_idle(void) -{ - struct spdk_nvmf_tcp_qpair tqpair; - - memset(&tqpair, 0, sizeof(tqpair)); - - /* case 1 */ - tqpair.max_queue_depth = 0; - tqpair.state_cntr[TCP_REQUEST_STATE_FREE] = 0; - CU_ASSERT(spdk_nvmf_tcp_qpair_is_idle(&tqpair.qpair) == true); - - /* case 2 */ - tqpair.max_queue_depth = UT_MAX_QUEUE_DEPTH; - tqpair.state_cntr[TCP_REQUEST_STATE_FREE] = 0; - CU_ASSERT(spdk_nvmf_tcp_qpair_is_idle(&tqpair.qpair) == false); - - /* case 3 */ - tqpair.state_cntr[TCP_REQUEST_STATE_FREE] = 1; - CU_ASSERT(spdk_nvmf_tcp_qpair_is_idle(&tqpair.qpair) == false); - - /* case 4 */ - tqpair.state_cntr[TCP_REQUEST_STATE_FREE] = UT_MAX_QUEUE_DEPTH; - CU_ASSERT(spdk_nvmf_tcp_qpair_is_idle(&tqpair.qpair) == true); -} - int main(int argc, char **argv) { CU_pSuite suite = NULL; @@ -403,8 +377,7 @@ int main(int argc, char **argv) if ( CU_add_test(suite, "nvmf_tcp_create", test_nvmf_tcp_create) == NULL || CU_add_test(suite, "nvmf_tcp_destroy", test_nvmf_tcp_destroy) == NULL || - CU_add_test(suite, "nvmf_tcp_poll_group_create", test_nvmf_tcp_poll_group_create) == NULL || - CU_add_test(suite, "nvmf_tcp_qpair_is_idle", test_nvmf_tcp_qpair_is_idle) == NULL + CU_add_test(suite, "nvmf_tcp_poll_group_create", test_nvmf_tcp_poll_group_create) == NULL ) { CU_cleanup_registry(); return CU_get_error();