From 88245ea26b167e050f30ea7f98b1d5672fc7f082 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Mon, 18 Jul 2016 15:17:32 -0700
Subject: [PATCH] nvmf: Rename MaxConnectionsPerSession to MaxQueuesPerSession

Change-Id: I9891f9ed481b93312152c2a59f4263003167f1d6
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
---
 lib/nvmf/conf.c          | 10 +++++-----
 lib/nvmf/nvmf.c          | 16 ++++++++--------
 lib/nvmf/nvmf_internal.h |  4 ++--
 lib/nvmf/session.c       |  2 +-
 test/nvmf/nvmf.conf      |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/nvmf/conf.c b/lib/nvmf/conf.c
index c68736787..7d3deaa2e 100644
--- a/lib/nvmf/conf.c
+++ b/lib/nvmf/conf.c
@@ -57,7 +57,7 @@ spdk_nvmf_parse_nvmf_tgt(void)
 {
 	struct spdk_conf_section *sp;
 	int max_queue_depth;
-	int max_conn_per_sess;
+	int max_queues_per_sess;
 	int rc;
 
 	sp = spdk_conf_find_section(NULL, "Nvmf");
@@ -71,12 +71,12 @@ spdk_nvmf_parse_nvmf_tgt(void)
 		max_queue_depth = SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH;
 	}
 
-	max_conn_per_sess = spdk_conf_section_get_intval(sp, "MaxConnectionsPerSession");
-	if (max_conn_per_sess < 0) {
-		max_conn_per_sess = SPDK_NVMF_DEFAULT_MAX_CONNECTIONS_PER_SESSION;
+	max_queues_per_sess = spdk_conf_section_get_intval(sp, "MaxQueuesPerSession");
+	if (max_queues_per_sess < 0) {
+		max_queues_per_sess = SPDK_NVMF_DEFAULT_MAX_QUEUES_PER_SESSION;
 	}
 
-	rc = nvmf_tgt_init(max_queue_depth, max_conn_per_sess);
+	rc = nvmf_tgt_init(max_queue_depth, max_queues_per_sess);
 	return rc;
 }
 
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index fc1a33025..e7f84440f 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -59,7 +59,7 @@ spdk_nvmf_initialize_pools(void)
 {
 	SPDK_NOTICELOG("\n*** NVMf Pool Creation ***\n");
 
-	g_num_requests = MAX_SUBSYSTEMS * g_nvmf_tgt.MaxConnectionsPerSession * g_nvmf_tgt.MaxQueueDepth;
+	g_num_requests = MAX_SUBSYSTEMS * g_nvmf_tgt.max_queues_per_session * g_nvmf_tgt.MaxQueueDepth;
 
 	/* create NVMe backend request pool */
 	request_mempool = rte_mempool_create("NVMe_Pool",
@@ -117,7 +117,7 @@ spdk_nvmf_check_pools(void)
 }
 
 int
-nvmf_tgt_init(int max_queue_depth, int max_conn_per_sess)
+nvmf_tgt_init(int max_queue_depth, int max_queues_per_sess)
 {
 	int rc;
 
@@ -131,13 +131,13 @@ nvmf_tgt_init(int max_queue_depth, int max_conn_per_sess)
 		return -EINVAL;
 	}
 
-	if (max_conn_per_sess >= 1 &&
-	    max_conn_per_sess <= SPDK_NVMF_DEFAULT_MAX_CONNECTIONS_PER_SESSION) {
-		g_nvmf_tgt.MaxConnectionsPerSession = max_conn_per_sess;
-		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "MaxConnectionsPerSession: %d\n",
-			      g_nvmf_tgt.MaxConnectionsPerSession);
+	if (max_queues_per_sess >= 1 &&
+	    max_queues_per_sess <= SPDK_NVMF_DEFAULT_MAX_QUEUES_PER_SESSION) {
+		g_nvmf_tgt.max_queues_per_session = max_queues_per_sess;
+		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "MaxQueuesPerSession: %d\n",
+			      g_nvmf_tgt.max_queues_per_session);
 	} else {
-		SPDK_ERRLOG("Invalid MaxConnectionsPerSession: %d\n", max_conn_per_sess);
+		SPDK_ERRLOG("Invalid MaxQueuesPerSession: %d\n", max_queues_per_sess);
 		return -EINVAL;
 	}
 
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index 2ebe31438..1899c167e 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -56,7 +56,7 @@
 
 #define SPDK_NVMF_DEFAULT_NUM_SESSIONS_PER_LCORE 1
 #define SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH 128
-#define SPDK_NVMF_DEFAULT_MAX_CONNECTIONS_PER_SESSION 4
+#define SPDK_NVMF_DEFAULT_MAX_QUEUES_PER_SESSION 4
 #define SPDK_NVMF_DEFAULT_SIN_PORT ((uint16_t)4420)
 
 #define OBJECT_NVMF_IO				0x30
@@ -100,7 +100,7 @@ struct spdk_nvmf_globals {
 	pthread_mutex_t mutex;
 
 	int MaxQueueDepth;
-	int MaxConnectionsPerSession;
+	int max_queues_per_session;
 
 	uint16_t	   sin_port;
 };
diff --git a/lib/nvmf/session.c b/lib/nvmf/session.c
index f301b0efa..5e58eb536 100644
--- a/lib/nvmf/session.c
+++ b/lib/nvmf/session.c
@@ -246,7 +246,7 @@ spdk_nvmf_session_connect(struct spdk_nvmf_conn *conn,
 		TAILQ_INIT(&session->connections);
 		session->num_connections = 0;
 		session->subsys = subsystem;
-		session->max_connections_allowed = g_nvmf_tgt.MaxConnectionsPerSession;
+		session->max_connections_allowed = g_nvmf_tgt.max_queues_per_session;
 
 		if (subsystem->subtype == SPDK_NVMF_SUBTYPE_NVME) {
 			nvmf_init_nvme_session_properties(session);
diff --git a/test/nvmf/nvmf.conf b/test/nvmf/nvmf.conf
index 01092b3f3..9a0d01359 100644
--- a/test/nvmf/nvmf.conf
+++ b/test/nvmf/nvmf.conf
@@ -3,7 +3,7 @@
   LogFacility "local7"
 
 [Nvmf]
-  MaxConnectionsPerSession 4
+  MaxQueuesPerSession 4
 
 [Nvme]
   ClaimAllDevices Yes