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

nvmf: Remove duplicated nqn from subsystem group

Browse Source 
The nqn is in the subsystem.

Change-Id: I101dc45b7958d1e9148a09e85604a90936498d8c
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-07-11 11:43:04 -07:00 committed by Daniel Verkamp
parent cd393178ca
commit 548ab005af
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/nvmf/subsystem.c
View File

@ -165,8 +165,6 @@ spdk_nvmf_subsystem_destruct(struct spdk_nvmf_subsystem_grp *ss_group)
return; return;
} }
free(ss_group->name);
for (i = 0; i < ss_group->map_count; i++) { for (i = 0; i < ss_group->map_count; i++) {
ss_group->map[i].host->ref--; ss_group->map[i].host->ref--;
} }
@ -187,20 +185,20 @@ spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group,
port = spdk_nvmf_port_find_by_tag(port_tag); port = spdk_nvmf_port_find_by_tag(port_tag);
if (port == NULL) { if (port == NULL) {
SPDK_ERRLOG("%s: Port%d not found\n", ss_group->name, port_tag); SPDK_ERRLOG("%s: Port%d not found\n", ss_group->subsystem->subnqn, port_tag);
return -1; return -1;
} }
if (port->state != GROUP_READY) { if (port->state != GROUP_READY) {
SPDK_ERRLOG("%s: Port%d not active\n", ss_group->name, port_tag); SPDK_ERRLOG("%s: Port%d not active\n", ss_group->subsystem->subnqn, port_tag);
return -1; return -1;
} }
host = spdk_nvmf_host_find_by_tag(host_tag); host = spdk_nvmf_host_find_by_tag(host_tag);
if (host == NULL) { if (host == NULL) {
SPDK_ERRLOG("%s: Host%d not found\n", ss_group->name, host_tag); SPDK_ERRLOG("%s: Host%d not found\n", ss_group->subsystem->subnqn, host_tag);
return -1; return -1;
} }
if (host->state != GROUP_READY) { if (host->state != GROUP_READY) {
SPDK_ERRLOG("%s: Host%d not active\n", ss_group->name, host_tag); SPDK_ERRLOG("%s: Host%d not active\n", ss_group->subsystem->subnqn, host_tag);
return -1; return -1;
} }
host->ref++; host->ref++;
@ -217,7 +215,8 @@ spdk_cf_add_nvmf_subsystem(struct spdk_conf_section *sp)
{ {
struct spdk_nvmf_subsystem_grp *ss_group; struct spdk_nvmf_subsystem_grp *ss_group;
const char *port_tag, *ig_tag; const char *port_tag, *ig_tag;
const char *val, *name; const char *val;
char *name = NULL;
int port_tag_i, ig_tag_i; int port_tag_i, ig_tag_i;
struct spdk_nvmf_ctrlr *nvmf_ctrlr; struct spdk_nvmf_ctrlr *nvmf_ctrlr;
int i, ret; int i, ret;
@ -233,30 +232,30 @@ spdk_cf_add_nvmf_subsystem(struct spdk_conf_section *sp)
ss_group->num = sp->num; ss_group->num = sp->num;
/* read in and verify the NQN for the subsystem */ /* read in and verify the NQN for the subsystem */
name = spdk_conf_section_get_val(sp, "SubsystemName"); val = spdk_conf_section_get_val(sp, "SubsystemName");
if (name == NULL) { if (val == NULL) {
SPDK_ERRLOG("Subsystem Group %d: SubsystemName not found\n", ss_group->num); SPDK_ERRLOG("Subsystem Group %d: SubsystemName not found\n", ss_group->num);
goto err0; goto err0;
} }
if (strncasecmp(name, "nqn.", 4) != 0) { if (strncasecmp(val, "nqn.", 4) != 0) {
ss_group->name = spdk_sprintf_alloc("%s:%s", g_nvmf_tgt.nodebase, name); name = spdk_sprintf_alloc("%s:%s", g_nvmf_tgt.nodebase, val);
} else { } else {
ss_group->name = strdup(name); name = strdup(val);
} }
if (!ss_group->name) { if (!name) {
SPDK_ERRLOG("Could not allocate Controller Node name\n"); SPDK_ERRLOG("Could not allocate Controller Node name\n");
goto err0; goto err0;
} }
if (spdk_check_nvmf_name(ss_group->name) != 0) { if (spdk_check_nvmf_name(name) != 0) {
SPDK_ERRLOG("Controller Node name (n=%s) (fn=%s) contains an invalid character or format.\n", SPDK_ERRLOG("Controller Node name (n=%s) (fn=%s) contains an invalid character or format.\n",
name, ss_group->name); name, name);
goto err0; goto err0;
} }
printf(" NVMf Subsystem: Name: %s\n", ss_group->name); printf(" NVMf Subsystem: Name: %s\n", name);
/* Setup initiator and port access mapping */ /* Setup initiator and port access mapping */
val = spdk_conf_section_get_val(sp, "Mapping"); val = spdk_conf_section_get_val(sp, "Mapping");
@ -302,7 +301,7 @@ spdk_cf_add_nvmf_subsystem(struct spdk_conf_section *sp)
} }
/* register this subsystem with the NVMf library */ /* register this subsystem with the NVMf library */
ss_group->subsystem = nvmf_create_subsystem(ss_group->num, ss_group->name, SPDK_NVMF_SUB_NVME); ss_group->subsystem = nvmf_create_subsystem(ss_group->num, name, SPDK_NVMF_SUB_NVME);
if (ss_group->subsystem == NULL) { if (ss_group->subsystem == NULL) {
SPDK_ERRLOG("Failed creating new nvmf library subsystem\n"); SPDK_ERRLOG("Failed creating new nvmf library subsystem\n");
goto err0; goto err0;
@ -332,8 +331,13 @@ spdk_cf_add_nvmf_subsystem(struct spdk_conf_section *sp)
TAILQ_INSERT_TAIL(&g_ssg_head, ss_group, tailq); TAILQ_INSERT_TAIL(&g_ssg_head, ss_group, tailq);
free(name);
return 0; return 0;
err0: err0:
if (name) {
free(name);
}
spdk_nvmf_subsystem_destruct(ss_group); spdk_nvmf_subsystem_destruct(ss_group);
return -1; return -1;
} }
@ -342,6 +346,7 @@ static int
spdk_add_nvmf_discovery_subsystem(void) spdk_add_nvmf_discovery_subsystem(void)
{ {
struct spdk_nvmf_subsystem_grp *ss_group; struct spdk_nvmf_subsystem_grp *ss_group;
char *name;
ss_group = calloc(1, sizeof(*ss_group)); ss_group = calloc(1, sizeof(*ss_group));
if (!ss_group) { if (!ss_group) {
@ -350,20 +355,23 @@ spdk_add_nvmf_discovery_subsystem(void)
} }
ss_group->num = 0xffff; ss_group->num = 0xffff;
ss_group->name = strdup(SPDK_NVMF_DISCOVERY_NQN); name = strdup(SPDK_NVMF_DISCOVERY_NQN);
if (ss_group->name == NULL) { if (name == NULL) {
SPDK_ERRLOG("strdup ss_group->name error\n"); SPDK_ERRLOG("strdup ss_group->name error\n");
free(ss_group); free(ss_group);
return -1; return -1;
} }
ss_group->subsystem = nvmf_create_subsystem(ss_group->num, ss_group->name, SPDK_NVMF_SUB_DISCOVERY); ss_group->subsystem = nvmf_create_subsystem(ss_group->num, name, SPDK_NVMF_SUB_DISCOVERY);
if (ss_group->subsystem == NULL) { if (ss_group->subsystem == NULL) {
SPDK_ERRLOG("Failed creating discovery nvmf library subsystem\n"); SPDK_ERRLOG("Failed creating discovery nvmf library subsystem\n");
free(ss_group); free(ss_group);
free(name);
return -1; return -1;
} }
TAILQ_INSERT_TAIL(&g_ssg_head, ss_group, tailq); TAILQ_INSERT_TAIL(&g_ssg_head, ss_group, tailq);
free(name);
return 0; return 0;
} }

1
lib/nvmf/subsystem.h
View File

@ -65,7 +65,6 @@ struct spdk_nvmf_access_map {
struct spdk_nvmf_subsystem_grp { struct spdk_nvmf_subsystem_grp {
int num; int num;
char *name;
struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_subsystem *subsystem;
int map_count; int map_count;
struct spdk_nvmf_access_map map[MAX_PER_SUBSYSTEM_ACCESS_MAP]; struct spdk_nvmf_access_map map[MAX_PER_SUBSYSTEM_ACCESS_MAP];