From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Wed, 25 Nov 2020 19:58:09 +0000 (-0500)
Subject: maple_tree: Optimize mas_reuse_node() loop
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8b715131dc34b4650910374470b5c4221ee7e4ea;p=users%2Fjedix%2Flinux-maple.git

maple_tree: Optimize mas_reuse_node() loop

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 6d2d71e05759..8fbd063d7863 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2785,14 +2785,14 @@ static inline bool mas_reuse_node(struct ma_state *mas,
 
 	// Zero end of node.
 	if (end > bn->b_end) {
-		for (i = bn->b_end + 1; i < mt_slot_count(mas->node); i++) {
+		for (i = bn->b_end + 1; i < mt_pivots[bn->type]; i++) {
 			mte_set_slot(mas->node, i, NULL);
-			if (i < mt_pivot_count(mas->node))
-				mte_set_pivot(mas->node, i, 0);
+			mte_set_pivot(mas->node, i, 0);
 
 		//	if (!mte_is_leaf(mas->node) && mt_is_alloc(mas->tree))
 		//		mte_set_gap(mas->node, i, 0);
 		}
+		mte_set_slot(mas->node, mt_slots[bn->type] - 1, NULL);
 
 	}
 	return true;