From b4cd610015049c16d4809eb660c9cd641038014a Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Tue, 12 Oct 2021 11:37:20 -0400 Subject: [PATCH] mas_start() changes Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 27058c6b63b3d..580ef50244221 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) -- 2.50.1