maple_tree: Fix __mas_next() when the limit is hit

When a search limit is hit, restore the previous location so that
mas_next() works on that particular ma_state.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 63d4bc2e00c1a09b0ee59a26155c44874b6d6e3f..ab207b44afed193358979a276cc5b7487c386046 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3725,7 +3725,8 @@ static inline void *__mas_next(struct ma_state *mas, unsigned long limit,
                unsigned long *range_start)
 {
        void *entry = NULL;
-       struct maple_enode *prev_node;
+       struct maple_enode *prev_node = mas->node;
+       unsigned char offset = mas->offset;
        unsigned long index = mas->index;
        enum maple_type mt = mte_node_type(mas->node);
 
@@ -3749,10 +3750,15 @@ retry:
                if (mas_next_nentry(mas, limit, range_start))
                        break;
 
-               if (*range_start > limit)
+               if (*range_start > limit) {
+                       mas->offset = offset;
+                       mas->node = prev_node;
                        return NULL;
+               }
 
 next_node:
+               prev_node = mas->node;
+               offset = mas->offset;
                mas_next_node(mas, limit);
                mas->offset = 0;
                mt = mte_node_type(mas->node);