From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Fri, 7 Aug 2020 00:18:14 +0000 (-0400)
Subject: maple_tree: Change ordering of pivots and slots, as well as gaps in one
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=23d49ed3d4bc6bd035fcf0652716eb69698368bb;p=users%2Fjedix%2Flinux-maple.git

maple_tree: Change ordering of pivots and slots, as well as gaps in one
case.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---

diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
index 5d5e53316be2d..951d3c45ce26c 100644
--- a/include/linux/maple_tree.h
+++ b/include/linux/maple_tree.h
@@ -84,68 +84,67 @@ typedef struct maple_pnode *maple_pnode; // parent node.
  */
 struct maple_range_64 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_RANGE64_SLOTS];
 	unsigned long pivot[MAPLE_RANGE64_SLOTS - 1];
+	void __rcu *slot[MAPLE_RANGE64_SLOTS];
 };
 
 struct maple_arange_64 {
 	struct maple_pnode *parent;
-	unsigned long gap[MAPLE_ARANGE64_SLOTS];
-	void __rcu *slot[MAPLE_ARANGE64_SLOTS];
 	unsigned long pivot[MAPLE_ARANGE64_SLOTS - 1];
+	void __rcu *slot[MAPLE_ARANGE64_SLOTS];
+	unsigned long gap[MAPLE_ARANGE64_SLOTS];
 };
 
 struct maple_range_32 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_RANGE32_SLOTS];
 	u32 pivot[MAPLE_RANGE32_SLOTS - 1];
+	void __rcu *slot[MAPLE_RANGE32_SLOTS];
 };
 
 struct maple_range_16 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_RANGE16_SLOTS];
 	u16 pivot[MAPLE_RANGE16_SLOTS - 1];
+	void __rcu *slot[MAPLE_RANGE16_SLOTS];
 };
 
 struct maple_sparse_64 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_SPARSE64_SLOTS];
 	unsigned long pivot[MAPLE_SPARSE64_SLOTS];
+	void __rcu *slot[MAPLE_SPARSE64_SLOTS];
 };
 
 struct maple_sparse_32 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_SPARSE32_SLOTS];
 	u32 pivot[MAPLE_SPARSE32_SLOTS];
+	void __rcu *slot[MAPLE_SPARSE32_SLOTS];
 };
 
 struct maple_sparse_21 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_SPARSE21_SLOTS];
 	unsigned long pivot[(MAPLE_SPARSE21_SLOTS + 2) / 3];
+	void __rcu *slot[MAPLE_SPARSE21_SLOTS];
 };
 
 struct maple_sparse_16 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_SPARSE16_SLOTS];
 	u16 pivot[MAPLE_SPARSE16_SLOTS];
+	void __rcu *slot[MAPLE_SPARSE16_SLOTS];
 };
 
 struct maple_sparse_9 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_SPARSE9_SLOTS];
 	unsigned long pivot[(MAPLE_SPARSE9_SLOTS + 6) / 7];
+	void __rcu *slot[MAPLE_SPARSE9_SLOTS];
 };
 
 struct maple_sparse_6 {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_SPARSE6_SLOTS];
 	unsigned long pivot;	/* Use a bitmap for pivots */
+	void __rcu *slot[MAPLE_SPARSE6_SLOTS];
 };
 
 struct maple_topiary {
 	struct maple_pnode *parent;
-	void __rcu *slot[MAPLE_TOPIARY_SLOTS];
 	struct maple_enode *next; /* Overlaps the pivot */
 };