From 11b0c3cc518298105d909890682c387f6340b6fa Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Fri, 1 Jul 2016 13:18:24 -0700 Subject: [PATCH] nvmf: Standardize rdma init/fini functions Change-Id: Ifa453e865e110cd534d34aae1bc036cc9f09b1bd Signed-off-by: Ben Walker --- lib/nvmf/nvmf.c | 5 +++-- lib/nvmf/rdma.c | 9 ++++++++- lib/nvmf/rdma.h | 5 ++++- test/lib/nvmf/nvmf_c/nvmf_ut.c | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 3dbaa5a29..73e41d1cb 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -213,9 +213,9 @@ nvmf_tgt_subsystem_initialize(void) } /* initialize with the NVMf transport */ - rc = nvmf_rdma_init(); + rc = spdk_nvmf_rdma_init(); if (rc <= 0) { - SPDK_ERRLOG("nvmf_rdma_init() failed\n"); + SPDK_ERRLOG("spdk_nvmf_rdma_init() failed\n"); return rc; } /* initialize NVMe/NVMf backend */ @@ -253,6 +253,7 @@ nvmf_tgt_subsystem_fini(void) nvmf_shutdown(); spdk_nvmf_host_destroy_all(); spdk_nvmf_port_destroy_all(); + spdk_nvmf_rdma_fini(); free(g_nvmf_tgt.nodebase); pthread_mutex_destroy(&g_nvmf_tgt.mutex); diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 40eb9eefc..4929b8830 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -810,7 +810,7 @@ Initialize with RDMA transport. Query OFED for device list. */ int -nvmf_rdma_init(void) +spdk_nvmf_rdma_init(void) { struct ibv_device **dev_list; struct ibv_context *ibdev_ctx = NULL; @@ -880,6 +880,13 @@ nvmf_rdma_init(void) return num_devices_found; } +int +spdk_nvmf_rdma_fini(void) +{ + /* Nothing to do */ + return 0; +} + static int nvmf_recv(struct spdk_nvmf_conn *conn, struct ibv_wc *wc) { diff --git a/lib/nvmf/rdma.h b/lib/nvmf/rdma.h index 310e43eef..fd8317bd2 100644 --- a/lib/nvmf/rdma.h +++ b/lib/nvmf/rdma.h @@ -71,13 +71,16 @@ struct spdk_nvmf_rdma_request { uint32_t bb_len; }; +int spdk_nvmf_rdma_init(void); +int spdk_nvmf_rdma_fini(void); + int nvmf_post_rdma_read(struct spdk_nvmf_conn *conn, struct spdk_nvmf_request *req); int spdk_nvmf_rdma_request_complete(struct spdk_nvmf_conn *conn, struct spdk_nvmf_request *req); int spdk_nvmf_rdma_request_release(struct spdk_nvmf_conn *conn, struct spdk_nvmf_request *req); -int nvmf_rdma_init(void); + int spdk_nvmf_rdma_alloc_reqs(struct spdk_nvmf_conn *conn); void spdk_nvmf_rdma_free_reqs(struct spdk_nvmf_conn *conn); void spdk_nvmf_rdma_free_req(struct spdk_nvmf_request *req); diff --git a/test/lib/nvmf/nvmf_c/nvmf_ut.c b/test/lib/nvmf/nvmf_c/nvmf_ut.c index 28ceb8d1d..64480f7f5 100644 --- a/test/lib/nvmf/nvmf_c/nvmf_ut.c +++ b/test/lib/nvmf/nvmf_c/nvmf_ut.c @@ -88,7 +88,7 @@ int spdk_nvmf_parse_conf(void) return 0; } -int nvmf_rdma_init(void) +int spdk_nvmf_rdma_init(void) { return 0; }