From 9b00a03a245d9e8664ef71f20cc6454323b9c79e Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 8 Jun 2016 13:17:23 -0700 Subject: [PATCH] nvmf: drop spdk_nvmf_check_pools() parameter There is only a single global g_nvmf_tgt that can be passed to this function, so remove the parameter and use the global directly. Change-Id: Ia1a2a1e6cd3801101ddeb4de5526dd115fa7ef8f Signed-off-by: Daniel Verkamp --- app/nvmf_tgt/nvmf_tgt.c | 2 +- lib/nvmf/nvmf.c | 3 ++- lib/nvmf/nvmf.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c index 45f493aed..2ea0c8d5d 100644 --- a/app/nvmf_tgt/nvmf_tgt.c +++ b/app/nvmf_tgt/nvmf_tgt.c @@ -231,7 +231,7 @@ main(int argc, char **argv) spdk_app_fini(); - if (spdk_nvmf_check_pools(&g_nvmf_tgt) != 0) { + if (spdk_nvmf_check_pools() != 0) { rc = -1; } diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index a0ab44ddb..4729a3ffd 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -187,8 +187,9 @@ static int spdk_nvmf_check_pool(struct rte_mempool *pool, uint32_t count) } int -spdk_nvmf_check_pools(struct spdk_nvmf_globals *spdk_nvmf) +spdk_nvmf_check_pools(void) { + struct spdk_nvmf_globals *spdk_nvmf = &g_nvmf_tgt; int rc = 0; rc += spdk_nvmf_check_pool(spdk_nvmf->nvme_request_pool, SPDK_NVMF_DESC_POOL_SIZE(spdk_nvmf)); diff --git a/lib/nvmf/nvmf.h b/lib/nvmf/nvmf.h index 402dc79fd..24aa3288d 100644 --- a/lib/nvmf/nvmf.h +++ b/lib/nvmf/nvmf.h @@ -112,7 +112,7 @@ nvmf_tgt_init(char *authfile, char *nodebase, int max_in_capsule_data, int max_s struct nvmf_request; int -spdk_nvmf_check_pools(struct spdk_nvmf_globals *spdk_nvmf); +spdk_nvmf_check_pools(void); int nvmf_initialize(void);