From db6d1079fd6ade2bf459e67aef66b3e2960e004b Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Wed, 8 Jun 2016 13:19:48 -0700
Subject: [PATCH] nvmf: move g_nvmf_tgt to nvmf_internal.h

It is not part of the NVMf library's public API.

Change-Id: I665d5713343c9185cbdadaef4fedfdc83b8232d6
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 lib/nvmf/init_grp.c      |  2 +-
 lib/nvmf/nvmf.h          | 23 -----------------------
 lib/nvmf/nvmf_internal.h | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/nvmf/init_grp.c b/lib/nvmf/init_grp.c
index 4ac937dce..fdd7a4dd0 100644
--- a/lib/nvmf/init_grp.c
+++ b/lib/nvmf/init_grp.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "init_grp.h"
-#include "nvmf.h"
+#include "nvmf_internal.h"
 #include "subsystem_grp.h"
 #include "spdk/log.h"
 #include "spdk/trace.h"
diff --git a/lib/nvmf/nvmf.h b/lib/nvmf/nvmf.h
index 24aa3288d..915e96ddf 100644
--- a/lib/nvmf/nvmf.h
+++ b/lib/nvmf/nvmf.h
@@ -82,29 +82,6 @@
 #define TRACE_NVMF_LIB_COMPLETE			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x7)
 #define TRACE_NVMF_IO_COMPLETE			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x8)
 
-struct spdk_nvmf_globals {
-	char *authfile;
-
-	char *nodebase;
-
-	pthread_mutex_t mutex;
-
-	int MaxInCapsuleData;
-	int MaxSessionsPerSubsystem;
-	int MaxQueueDepth;
-	int MaxConnectionsPerSession;
-	int MaxRecvDataSegmentLength;
-
-	struct rte_mempool *rx_desc_pool;
-	struct rte_mempool *tx_desc_pool;
-	struct rte_mempool *nvme_request_pool;
-	struct rte_mempool *bb_small_pool;
-	struct rte_mempool *bb_large_pool;
-	uint16_t	   sin_port;
-};
-
-extern struct spdk_nvmf_globals g_nvmf_tgt;
-
 int
 nvmf_tgt_init(char *authfile, 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);
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index b3be2d23a..cf65caa2b 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -125,7 +125,30 @@ struct __attribute__((packed)) nvme_read_cdw13 {
 	uint8_t		rsvd[3];
 };
 
+struct spdk_nvmf_globals {
+	char *authfile;
+
+	char *nodebase;
+
+	pthread_mutex_t mutex;
+
+	int MaxInCapsuleData;
+	int MaxSessionsPerSubsystem;
+	int MaxQueueDepth;
+	int MaxConnectionsPerSession;
+	int MaxRecvDataSegmentLength;
+
+	struct rte_mempool *rx_desc_pool;
+	struct rte_mempool *tx_desc_pool;
+	struct rte_mempool *nvme_request_pool;
+	struct rte_mempool *bb_small_pool;
+	struct rte_mempool *bb_large_pool;
+	uint16_t	   sin_port;
+};
+
 void
 nvmf_complete_cmd(void *rsp, const struct spdk_nvme_cpl *cmp);
 
+extern struct spdk_nvmf_globals g_nvmf_tgt;
+
 #endif /* __NVMF_INTERNAL_H__ */