From db24ff75fec835dc41e3c5efbf135050a8c7897d Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 24 Aug 2017 13:15:30 -0700 Subject: [PATCH] nvmf_tgt: remove use of MAX_VIRTUAL_NAMESPACE The configuration file parser now uses its own (arbitrary) limit on the number of namespaces; this removes the need for MAX_VIRTUAL_NAMESPACE to be in the public API. The new MAX_NAMESPACES limit in conf.c is larger than the current MAX_VIRTUAL_NAMESPACE; any namespaces beyond the current limit will fail. Later patches will allow dynamically increasing the number of namespaces in a subsystem. Change-Id: Ice508ac0fee34622cd738b8f477f2dc20870d5f0 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/375635 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker --- app/nvmf_tgt/conf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/nvmf_tgt/conf.c b/app/nvmf_tgt/conf.c index 7751cbed5..44dc7ee87 100644 --- a/app/nvmf_tgt/conf.c +++ b/app/nvmf_tgt/conf.c @@ -45,6 +45,7 @@ #define MAX_LISTEN_ADDRESSES 255 #define MAX_HOSTS 255 +#define MAX_NAMESPACES 255 #define PORTNUMSTRLEN 32 #define SPDK_NVMF_DEFAULT_SIN_PORT ((uint16_t)4420) @@ -221,7 +222,8 @@ static int spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) { const char *nqn, *mode; - int i, ret; + size_t i; + int ret; int lcore; int num_listen_addrs; struct rpc_listen_address listen_addrs[MAX_LISTEN_ADDRESSES] = {}; @@ -230,7 +232,7 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) char *hosts[MAX_HOSTS]; const char *sn; int num_devs; - char *devs[MAX_VIRTUAL_NAMESPACE]; + char *devs[MAX_NAMESPACES]; nqn = spdk_conf_section_get_val(sp, "NQN"); mode = spdk_conf_section_get_val(sp, "Mode"); @@ -291,7 +293,7 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) sn = spdk_conf_section_get_val(sp, "SN"); num_devs = 0; - for (i = 0; i < MAX_VIRTUAL_NAMESPACE; i++) { + for (i = 0; i < SPDK_COUNTOF(devs); i++) { devs[i] = spdk_conf_section_get_nmval(sp, "Namespace", i, 0); if (!devs[i]) { break;