Commit 1bb4fac4 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Benjamin Walker
Browse files

nvmf: remove unimplemented AuthFile config 



This enables SPDK_NVMF_BUILD_ETC to be moved out of the library as well,
since only authfile was using it before

Change-Id: I10d1145881f9a0358d7effe2d2d9851899413e1b
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent d3bbbfee

app/nvmf_tgt/nvmf_tgt.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 


struct rte_mempool *request_mempool;



#define SPDK_NVMF_BUILD_ETC "/usr/local/etc/nvmf"

#define SPDK_NVMF_DEFAULT_CONFIG SPDK_NVMF_BUILD_ETC "/nvmf.conf"



static void

etc/spdk/nvmf.conf.in

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
  # Users can optionally change this to fit their environment.

  NodeBase "iqn.2013-06.com.intel.ch.spdk"



  # files

  AuthFile /usr/local/etc/nvmf/auth.conf



  # Set the optional in-capsule data byte length for I/O queue capsule size.

  # Accepted values must be divisible by 16 and less than or equal to

  # the default maximum transfer length NVMF_MAX_RECV_DATA_TRANSFER_SIZE.

lib/nvmf/conf.c

+1 −7
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ static int 
spdk_nvmf_parse_nvmf_tgt(void)

{

	struct spdk_conf_section *sp;

	char *authfile;

	char *nodebase;

	int max_in_capsule_data;

	int max_sessions_per_subsystem;
@@ -63,11 +62,6 @@ spdk_nvmf_parse_nvmf_tgt(void) 
		return -1;

	}



	authfile = spdk_conf_section_get_val(sp, "AuthFile");

	if (authfile == NULL) {

		authfile = SPDK_NVMF_DEFAULT_AUTHFILE;

	}



	nodebase = spdk_conf_section_get_val(sp, "NodeBase");

	if (nodebase == NULL) {

		nodebase = SPDK_NVMF_DEFAULT_NODEBASE;
@@ -96,7 +90,7 @@ spdk_nvmf_parse_nvmf_tgt(void) 
	max_recv_seg_len = SPDK_NVMF_MAX_RECV_DATA_TRANSFER_SIZE;

	listen_port = SPDK_NVMF_DEFAULT_SIN_PORT;



	rc = nvmf_tgt_init(authfile, nodebase, max_in_capsule_data, max_sessions_per_subsystem,

	rc = nvmf_tgt_init(nodebase, max_in_capsule_data, max_sessions_per_subsystem,

			   max_queue_depth, max_conn_per_sess, max_recv_seg_len, listen_port);



	return rc;

lib/nvmf/nvmf.c

+2 −10
Original line number Diff line number Diff line
@@ -209,22 +209,15 @@ spdk_nvmf_check_pools(void) 
}



int

nvmf_tgt_init(char *authfile, char *nodebase, int max_in_capsule_data,

nvmf_tgt_init(char *nodebase, int max_in_capsule_data,

	      int max_sessions_per_subsystem,

	      int max_queue_depth, int max_conn_per_sess, int max_recv_seg_len, int listen_port)

{

	int rc;



	g_nvmf_tgt.authfile = strdup(authfile);

	if (!g_nvmf_tgt.authfile) {

		SPDK_ERRLOG("No authfile provided\n");

		return -EINVAL;

	}

	SPDK_TRACELOG(SPDK_TRACE_DEBUG, "AuthFile: %s\n", g_nvmf_tgt.authfile);



	g_nvmf_tgt.nodebase = strdup(nodebase);

	if (!g_nvmf_tgt.nodebase) {

		SPDK_ERRLOG("No authfile provided\n");

		SPDK_ERRLOG("No NodeBase provided\n");

		return -EINVAL;

	}

	SPDK_TRACELOG(SPDK_TRACE_DEBUG, "NodeBase: %s\n", g_nvmf_tgt.nodebase);
@@ -348,7 +341,6 @@ nvmf_tgt_subsystem_fini(void) 
	nvmf_shutdown();

	nvmf_initiator_group_array_destroy();

	spdk_nvmf_port_destroy_all();

	free(g_nvmf_tgt.authfile);

	free(g_nvmf_tgt.nodebase);



	pthread_mutex_destroy(&g_nvmf_tgt.mutex);

lib/nvmf/nvmf.h

+1 −5
Original line number Diff line number Diff line
@@ -42,12 +42,8 @@ 
 *

 */





#define SPDK_NVMF_BUILD_ETC "/usr/local/etc/nvmf"





int

nvmf_tgt_init(char *authfile, char *nodebase, int max_in_capsule_data, int max_sessions,

nvmf_tgt_init(char *nodebase, int max_in_capsule_data, int max_sessions,

	      int max_queue_depth, int max_conn_per_sess, int max_recv_seg_len, int listen_port);



int