ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: Remove qpair_is_idle

Browse Source 
This wasn't used anywhere.

Change-Id: I405af3c808be284d19218f3f04c1e90e33e31de8
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446977
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ben Walker 2019-02-12 14:44:55 -07:00 committed by Jim Harris
parent ed0b611fc5
commit 527be2bf4e
7 changed files with 1 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/nvmf/rdma.c
View File

@ -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,

14
lib/nvmf/tcp.c
View File

@ -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,

6
lib/nvmf/transport.c
View File

@ -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)

7
lib/nvmf/transport.h
View File

@ -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);

6
test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
View File

@ -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)
{

6
test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
View File

@ -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 *

29
test/unit/lib/nvmf/tcp.c/tcp_ut.c
View File

@ -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();