From bb5d8e506ca6aaf63923caa134dc1da4643b5f33 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 10 Oct 2016 15:05:37 -0700 Subject: [PATCH] nvmf: Combine nvmf_tgt_init and nvmf_transport_init Change-Id: I6d0f92842f3b8626bc2c25b38bfa7f7ddea5e7cc Signed-off-by: Ben Walker --- app/nvmf_tgt/conf.c | 4 ++-- app/nvmf_tgt/nvmf_tgt.c | 2 +- include/spdk/nvmf.h | 6 +++--- lib/nvmf/nvmf.c | 12 ++++++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/nvmf_tgt/conf.c b/app/nvmf_tgt/conf.c index b8f8cdef4..9e5c274e7 100644 --- a/app/nvmf_tgt/conf.c +++ b/app/nvmf_tgt/conf.c @@ -216,9 +216,9 @@ spdk_nvmf_parse_nvmf_tgt(void) } g_spdk_nvmf_tgt_conf.acceptor_poll_rate = acceptor_poll_rate; - rc = nvmf_tgt_init(max_queue_depth, max_queues_per_sess, in_capsule_data_size, max_io_size); + rc = spdk_nvmf_tgt_init(max_queue_depth, max_queues_per_sess, in_capsule_data_size, max_io_size); if (rc != 0) { - SPDK_ERRLOG("nvmf_tgt_init() failed\n"); + SPDK_ERRLOG("spdk_nvmf_tgt_init() failed\n"); return rc; } diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c index 8394d91b9..78ea14df3 100644 --- a/app/nvmf_tgt/nvmf_tgt.c +++ b/app/nvmf_tgt/nvmf_tgt.c @@ -118,7 +118,7 @@ shutdown_subsystems(void) static void acceptor_poller_unregistered_event(struct spdk_event *event) { - nvmf_tgt_fini(); + spdk_nvmf_tgt_fini(); shutdown_subsystems(); } diff --git a/include/spdk/nvmf.h b/include/spdk/nvmf.h index 72614bf7f..77513a939 100644 --- a/include/spdk/nvmf.h +++ b/include/spdk/nvmf.h @@ -50,10 +50,10 @@ #define nvmf_min(a,b) (((a)<(b))?(a):(b)) #define nvmf_max(a,b) (((a)>(b))?(a):(b)) -int nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_conn_per_sess, - uint32_t in_capsule_data_size, uint32_t max_io_size); +int spdk_nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_conn_per_sess, + uint32_t in_capsule_data_size, uint32_t max_io_size); -int nvmf_tgt_fini(void); +int spdk_nvmf_tgt_fini(void); int spdk_nvmf_check_pools(void); diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index f7d3f8e9b..fcc5011ad 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -48,8 +48,8 @@ SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF) struct spdk_nvmf_globals g_nvmf_tgt; int -nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_queues_per_sess, - uint32_t in_capsule_data_size, uint32_t max_io_size) +spdk_nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_queues_per_sess, + uint32_t in_capsule_data_size, uint32_t max_io_size) { int rc; @@ -58,6 +58,8 @@ nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_queues_per_sess, g_nvmf_tgt.in_capsule_data_size = in_capsule_data_size; g_nvmf_tgt.max_io_size = max_io_size; + spdk_nvmf_transport_init(); + SPDK_TRACELOG(SPDK_TRACE_NVMF, "Max Queues Per Session: %d\n", max_queues_per_sess); SPDK_TRACELOG(SPDK_TRACE_NVMF, "Max Queue Depth: %d\n", max_queue_depth); SPDK_TRACELOG(SPDK_TRACE_NVMF, "Max In Capsule Data: %d bytes\n", in_capsule_data_size); @@ -73,9 +75,11 @@ nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_queues_per_sess, } int -nvmf_tgt_fini(void) +spdk_nvmf_tgt_fini(void) { - return spdk_nvmf_transport_fini(); + spdk_nvmf_transport_fini(); + + return 0; } SPDK_TRACE_REGISTER_FN(nvmf_trace)