From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Thu, 29 Oct 2020 18:35:26 +0000 (-0400)
Subject: maple_tree: Rename MA_STATE_ defines
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f08dab3dd9648ef08c52318ff91ce16d6b2f14a9;p=users%2Fjedix%2Flinux-maple.git

maple_tree: Rename MA_STATE_ defines

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index eb8f549b4537..ce4c0d15deb7 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -20,8 +20,8 @@
 #define MA_ROOT_PARENT 1
 
 /* Maple state flags */
-#define MA_STATE_ADVANCED_OP	1
-#define MA_STATE_LAST_SLOT	2
+#define MA_STATE_BULK		1
+#define MA_STATE_REBALANCE	2
 
 #define ma_parent_ptr(x) ((struct maple_pnode *)(x))
 #define ma_mnode_ptr(x) ((struct maple_node *)(x))
@@ -1415,7 +1415,7 @@ static inline int mab_calc_split(struct ma_state *mas,
 		unsigned char min = mt_min_slots[b_node->type] - 1;
 
 		*mid_split = 0;
-		if ((mas->mas_flags & MA_STATE_LAST_SLOT) &&
+		if ((mas->mas_flags & MA_STATE_REBALANCE) &&
 		    ma_is_leaf(b_node->type)) {
 			min = 2;
 			split = mt_slots[b_node->type] - min;
@@ -1570,13 +1570,13 @@ static inline void mas_descend_adopt(struct ma_state *mas)
 
 static inline void mas_advanced_may_rebalance(struct ma_state *mas)
 {
-	if (!(mas->mas_flags & MA_STATE_ADVANCED_OP))
+	if (!(mas->mas_flags & MA_STATE_BULK))
 		return;
 
 	if (mte_is_root(mas->node))
 		return;
 
-	mas->mas_flags |= MA_STATE_LAST_SLOT;
+	mas->mas_flags |= MA_STATE_REBALANCE;
 }
 /*
  * mas_store_b_node() - Store an @entry into the b_node while also copying the
@@ -3148,7 +3148,7 @@ static inline bool mas_node_store(struct ma_state *mas, void *entry,
 		return false;
 
 	if (!mte_is_root(mas->node) && (new_end <= mt_min_slots[mt]) &&
-	    !(mas->mas_flags & MA_STATE_ADVANCED_OP)) // not enough data.
+	    !(mas->mas_flags & MA_STATE_BULK)) // not enough data.
 		return false;
 
 	// set up node.
@@ -4843,7 +4843,7 @@ EXPORT_SYMBOL(mtree_destroy);
  */
 void *mas_store(struct ma_state *mas, void *entry)
 {
-	mas->mas_flags |= MA_STATE_ADVANCED_OP;
+	mas->mas_flags |= MA_STATE_BULK;
 	if (mas->index <= mas->last)
 		return _mas_store(mas, entry, true);
 
@@ -4908,7 +4908,7 @@ void mas_destroy(struct ma_state *mas)
 	// it is possible that the number inserted is less than the expected
 	// number.  To fix an invalid final node, a check is performed here to
 	// rebalance the previous node with the final node.
-	if (mas->mas_flags & MA_STATE_LAST_SLOT) {
+	if (mas->mas_flags & MA_STATE_REBALANCE) {
 		unsigned char end;
 		unsigned long range_min, range_max;
 
@@ -4917,7 +4917,7 @@ void mas_destroy(struct ma_state *mas)
 		if (end < mt_min_slot_count(mas->node) - 1) {
 			mas_destroy_rebalance(mas, end);
 		}
-		mas->mas_flags &= ~MA_STATE_LAST_SLOT;
+		mas->mas_flags &= ~MA_STATE_REBALANCE;
 	}
 
 	while (mas->alloc && !(((unsigned long)mas->alloc & 0x1))) {