]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
maple_tree: Clean up mas_ascend() on root parent
authorLiam R. Howlett <Liam.Howlett@Oracle.com>
Wed, 11 Nov 2020 18:39:10 +0000 (13:39 -0500)
committerLiam R. Howlett <Liam.Howlett@Oracle.com>
Tue, 5 Jan 2021 17:31:25 +0000 (12:31 -0500)
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
lib/maple_tree.c

index 476c197d7adb286d253656797dbe8203f54e2f1a..02113349de6e6081e18d6e8125ff757d3b8b7cd4 100644 (file)
@@ -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)