From 102c085aac8df748d45e6ffeb064a3c9f69fe700 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Wed, 11 Nov 2020 13:39:10 -0500 Subject: [PATCH] maple_tree: Clean up mas_ascend() on root parent Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 476c197d7adb..02113349de6e 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -791,10 +791,8 @@ static inline void mas_ascend(struct ma_state *mas) mas_parent_enum(mas, mas->node)); a_type = mas_parent_enum(mas, mas->node); a_enode = p_enode; - if (mte_is_root(a_enode)) { - a_node = mte_to_node(a_enode); + if (mte_is_root(a_enode)) goto parent_is_root; - } mas->node = p_enode; ascend: @@ -812,9 +810,9 @@ ascend: max = mte_pivot(a_enode, a_slot); } -parent_is_root: no_parent: if (ma_is_root(a_node)) { +parent_is_root: if (!set_min) min = 0; if (!set_max) -- 2.50.1