From 26d60dc43318a8bd77b7221d9ad78770bde3b058 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Wed, 27 Oct 2021 11:14:31 -0700
Subject: [PATCH] nvme: Move active_ns_count next to ns in spdk_nvme_ctrlr

This is the count of items in the RB_TREE, so put the two next to each
other.

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: Ib30bee12e65065dc414b55e85cfffa2026057e9f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10035
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
---
 lib/nvme/nvme_internal.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h
index 30b9f4f18..eb4f23d88 100644
--- a/lib/nvme/nvme_internal.h
+++ b/lib/nvme/nvme_internal.h
@@ -864,6 +864,9 @@ struct spdk_nvme_ctrlr {
 	/* Tree of namespaces */
 	RB_HEAD(nvme_ns_tree, spdk_nvme_ns)	ns;
 
+	/* The number of active namespaces */
+	uint32_t			active_ns_count;
+
 	bool				is_removed;
 
 	bool				is_resetting;
@@ -946,11 +949,6 @@ struct spdk_nvme_ctrlr {
 	 */
 	struct spdk_nvme_zns_ctrlr_data	*cdata_zns;
 
-	/**
-	 * Keep track of active namespaces
-	 */
-	uint32_t			active_ns_count;
-
 	struct spdk_bit_array		*free_io_qids;
 	TAILQ_HEAD(, spdk_nvme_qpair)	active_io_qpairs;