maple_tree: Optimize mas_node_walk() for reads only

Now that only reads use mas_node_walk(), there are some situations which will not
need to be checked.  offset always starts at zero.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index eff82d9854841dd4a1dbea22fafb07d106a0a939..0e65002fa26c616c7f357ca86ad4b2c66f6f9efb 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3679,23 +3679,17 @@ static inline void mas_node_walk(struct ma_state *mas, struct maple_node *node,
                return;
        }
 
-       offset = mas->offset;
-       min = mas_safe_min(mas, pivots, offset);
+       offset = 0;
+       min = mas->min;
        max = pivots[offset];
        if (unlikely(ma_dead_node(node)))
                return;
 
        count = mt_pivots[type];
-       if (unlikely(offset == count))
-               goto max;
-
        index = mas->index;
        if (unlikely(index <= max))
                goto done;
 
-       if (unlikely(!max && offset))
-               goto max;
-
        offset++;
        min = max + 1;
        while (offset < count) {
@@ -3713,7 +3707,6 @@ static inline void mas_node_walk(struct ma_state *mas, struct maple_node *node,
                offset++;
        }
 
-max:
        max = mas->max;
 done:
        *range_max = max;