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

nvmf_tgt: remove use of MAX_VIRTUAL_NAMESPACE

Browse Source 
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 <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/375635
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Daniel Verkamp 2017-08-24 13:15:30 -07:00
parent 27b5a0318d
commit db24ff75fe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/nvmf_tgt/conf.c
View File

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