From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Tue, 12 Oct 2021 15:37:20 +0000 (-0400)
Subject: mas_start() changes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b4cd610015049c16d4809eb660c9cd641038014a;p=users%2Fjedix%2Flinux-maple.git

mas_start() changes

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 27058c6b63b3..580ef5024422 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1290,14 +1290,14 @@ static inline struct maple_enode *mas_start(struct ma_state *mas)
 		mas->depth = 0;
 		mas->offset = 0;
 
+		root = mas_root(mas);
 		/* empty tree */
-		if (unlikely(!mas_root(mas)))
+		if (unlikely(!root))
 			goto done;
 
-		root = mte_safe_root(mas_root(mas));
 
-		if (likely(xa_is_node(mas_root(mas)))) {
-			mas->node = root;
+		if (likely(xa_is_node(root))) {
+			mas->node = mte_safe_root(root);
 		} else {
 			/* Single entry tree. */
 			if (mas->index > 0)