maple_tree: Rework mas_first_entry() for leaf case

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 0a4b1221a9e5a1ca444e9643a1f12a5a740108d6..c5cecbec4a66be4e58a38abb726586450f56f845 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1269,8 +1269,12 @@ static inline unsigned long mas_first_entry(struct ma_state *mas,
        enum maple_type mt;
 
        while (likely(!mte_is_leaf(mas->node))) {
-               max = mte_pivot(mas->node, 0);
-               mas->node = mas_get_slot(mas, 0);
+               mn = mas_mn(mas);
+               mt = mte_node_type(mas->node);
+               slots = ma_slots(mn, mt);
+               pivots = ma_pivots(mn, mt);
+               max = pivots[0];
+               mas->node = mas_slot(mas, slots, 0);
        }
 
        mas->max = max;