Commit 422b1474 authored by Ben Walker's avatar Ben Walker
Browse files

nvmf: Standardize names in init_grp.h 



Prefix with spdk_nvmf_host.

Change-Id: I053030febf5b7157cc2c7075ac6170bc59ce0ced
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 6eb1bee6

lib/nvmf/conf.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

		free(netmasks);

lib/nvmf/init_grp.c

+7 −7
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
static TAILQ_HEAD(, spdk_nvmf_host) g_host_head = TAILQ_HEAD_INITIALIZER(g_host_head);



struct spdk_nvmf_host *

spdk_nvmf_init_grp_create(int tag,

spdk_nvmf_host_create(int tag,

		      int num_netmasks,

		      char **netmasks)

{
@@ -60,7 +60,7 @@ spdk_nvmf_init_grp_create(int tag, 
	struct spdk_nvmf_host *host = NULL;



	/* 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",

			    tag);

		return NULL;
@@ -240,7 +240,7 @@ spdk_nvmf_allow_netmask(const char *netmask, const char *addr) 
}



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;

	int i;
@@ -268,7 +268,7 @@ nvmf_initiator_group_find_by_addr(char *addr) 
}



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;
@@ -283,7 +283,7 @@ nvmf_initiator_group_find_by_tag(int tag) 
}



void

nvmf_initiator_group_array_destroy(void)

spdk_nvmf_host_destroy_all(void)

{

	struct spdk_nvmf_host *host;

lib/nvmf/init_grp.h

+6 −6
Original line number Diff line number Diff line
@@ -48,17 +48,17 @@ struct spdk_nvmf_host { 


/* NVMf Initiator Group management API */

struct spdk_nvmf_host *

spdk_nvmf_init_grp_create(int tag,

spdk_nvmf_host_create(int tag,

		      int num_netmasks,

		      char **netmasks);



struct spdk_nvmf_host *

nvmf_initiator_group_find_by_tag(int tag);

spdk_nvmf_host_find_by_tag(int tag);



struct spdk_nvmf_host *

nvmf_initiator_group_find_by_addr(char *addr);

spdk_nvmf_host_find_by_addr(char *addr);



void

nvmf_initiator_group_array_destroy(void);

spdk_nvmf_host_destroy_all(void);



#endif /* NVMF_INIT_GRP_H */

lib/nvmf/nvmf.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ nvmf_tgt_subsystem_fini(void) 
{

	spdk_shutdown_nvmf_subsystems();

	nvmf_shutdown();

	nvmf_initiator_group_array_destroy();

	spdk_nvmf_host_destroy_all();

	spdk_nvmf_port_destroy_all();

	free(g_nvmf_tgt.nodebase);

lib/nvmf/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ nvmf_rdma_cm_connect(struct rdma_cm_event *event) 
	SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Route: peer addr %s\n",

		      addr_str);



	host = nvmf_initiator_group_find_by_addr(addr_str);

	host = spdk_nvmf_host_find_by_addr(addr_str);

	if (host == NULL) {

		SPDK_ERRLOG("connect request: remote host addr not provisioned!\n");

		goto err1;