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

nvmf: Standardize names in init_grp.h

Browse Source 
Prefix with spdk_nvmf_host.

Change-Id: I053030febf5b7157cc2c7075ac6170bc59ce0ced
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-06-08 16:00:39 -07:00
parent 6eb1bee64b
commit 422b147499
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nvmf/conf.c
View File

@ -296,7 +296,7 @@ spdk_nvmf_parse_init_grp(struct spdk_conf_section *sp)
} }
} }
host = spdk_nvmf_init_grp_create(sp->num, num_netmasks, netmasks); host = spdk_nvmf_host_create(sp->num, num_netmasks, netmasks);
if (!host) { if (!host) {
free(netmasks); free(netmasks);

14
lib/nvmf/init_grp.c
View File

@ -52,15 +52,15 @@
static TAILQ_HEAD(, spdk_nvmf_host) g_host_head = TAILQ_HEAD_INITIALIZER(g_host_head); static TAILQ_HEAD(, spdk_nvmf_host) g_host_head = TAILQ_HEAD_INITIALIZER(g_host_head);
struct spdk_nvmf_host * struct spdk_nvmf_host *
spdk_nvmf_init_grp_create(int tag, spdk_nvmf_host_create(int tag,
int num_netmasks, int num_netmasks,
char **netmasks) char **netmasks)
{ {
int i; int i;
struct spdk_nvmf_host *host = NULL; struct spdk_nvmf_host *host = NULL;
/* Make sure there are no duplicate initiator group tags */ /* Make sure there are no duplicate initiator group tags */
if (nvmf_initiator_group_find_by_tag(tag)) { if (spdk_nvmf_host_find_by_tag(tag)) {
SPDK_ERRLOG("Initiator group creation failed due to duplicate initiator group tag (%d)\n", SPDK_ERRLOG("Initiator group creation failed due to duplicate initiator group tag (%d)\n",
tag); tag);
return NULL; return NULL;
@ -240,7 +240,7 @@ spdk_nvmf_allow_netmask(const char *netmask, const char *addr)
} }
struct spdk_nvmf_host * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_addr(char *addr) spdk_nvmf_host_find_by_addr(char *addr)
{ {
struct spdk_nvmf_host *host; struct spdk_nvmf_host *host;
int i; int i;
@ -268,7 +268,7 @@ nvmf_initiator_group_find_by_addr(char *addr)
} }
struct spdk_nvmf_host * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_tag(int tag) spdk_nvmf_host_find_by_tag(int tag)
{ {
struct spdk_nvmf_host *host; struct spdk_nvmf_host *host;
@ -283,7 +283,7 @@ nvmf_initiator_group_find_by_tag(int tag)
} }
void void
nvmf_initiator_group_array_destroy(void) spdk_nvmf_host_destroy_all(void)
{ {
struct spdk_nvmf_host *host; struct spdk_nvmf_host *host;

12
lib/nvmf/init_grp.h
View File

@ -48,17 +48,17 @@ struct spdk_nvmf_host {
/* NVMf Initiator Group management API */ /* NVMf Initiator Group management API */
struct spdk_nvmf_host * struct spdk_nvmf_host *
spdk_nvmf_init_grp_create(int tag, spdk_nvmf_host_create(int tag,
int num_netmasks, int num_netmasks,
char **netmasks); char **netmasks);
struct spdk_nvmf_host * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_tag(int tag); spdk_nvmf_host_find_by_tag(int tag);
struct spdk_nvmf_host * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_addr(char *addr); spdk_nvmf_host_find_by_addr(char *addr);
void void
nvmf_initiator_group_array_destroy(void); spdk_nvmf_host_destroy_all(void);
#endif /* NVMF_INIT_GRP_H */ #endif /* NVMF_INIT_GRP_H */

2
lib/nvmf/nvmf.c
View File

@ -339,7 +339,7 @@ nvmf_tgt_subsystem_fini(void)
{ {
spdk_shutdown_nvmf_subsystems(); spdk_shutdown_nvmf_subsystems();
nvmf_shutdown(); nvmf_shutdown();
nvmf_initiator_group_array_destroy(); spdk_nvmf_host_destroy_all();
spdk_nvmf_port_destroy_all(); spdk_nvmf_port_destroy_all();
free(g_nvmf_tgt.nodebase); free(g_nvmf_tgt.nodebase);

2
lib/nvmf/rdma.c
View File

@ -453,7 +453,7 @@ nvmf_rdma_cm_connect(struct rdma_cm_event *event)
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Route: peer addr %s\n", SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Route: peer addr %s\n",
addr_str); addr_str);
host = nvmf_initiator_group_find_by_addr(addr_str); host = spdk_nvmf_host_find_by_addr(addr_str);
if (host == NULL) { if (host == NULL) {
SPDK_ERRLOG("connect request: remote host addr not provisioned!\n"); SPDK_ERRLOG("connect request: remote host addr not provisioned!\n");
goto err1; goto err1;

2
lib/nvmf/subsystem_grp.c
View File

@ -244,7 +244,7 @@ spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group,
SPDK_ERRLOG("%s: Port%d not active\n", ss_group->name, port_tag); SPDK_ERRLOG("%s: Port%d not active\n", ss_group->name, port_tag);
return -1; return -1;
} }
host = nvmf_initiator_group_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->name, host_tag);
return -1; return -1;

4
test/lib/nvmf/nvmf_c/nvmf_ut.c
View File

@ -98,7 +98,7 @@ int spdk_initialize_nvmf_conns(int max_connections)
return 0; return 0;
} }
void nvmf_initiator_group_array_destroy(void) void spdk_nvmf_host_destroy_all(void)
{ {
} }
@ -111,7 +111,7 @@ void spdk_nvmf_port_destroy_all(void)
{ {
} }
struct spdk_nvmf_host *nvmf_initiator_group_find_by_tag(int tag) struct spdk_nvmf_host *spdk_nvmf_host_find_by_tag(int tag)
{ {
return NULL; return NULL;
} }