From b80ad8f75182e999c1015f6fab489e1fab6c3736 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Mon, 21 Dec 2020 21:02:02 -0500 Subject: [PATCH] maple_tree: Fix __mas_next setting mas->node to NULL. This breaks prev/next beyond the limit which is useful to do. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index cf92a5fd4f83..522f5fdfe507 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -3853,13 +3853,8 @@ retry: else entry = mas_first_entry(mas, limit, &r_start); - if (unlikely((r_start > limit))) { - *range_start = limit; - mas->index = mas->last = limit; - mas->offset = offset; - mas->node = prev_node; - return NULL; - } + if (unlikely((r_start > limit))) + break; if (likely(entry)) { if (unlikely(mas_dead_node(mas, index))) @@ -3878,7 +3873,9 @@ next_node: } *range_start = limit; - mas->last = limit; + mas->last = mas->index = limit; + mas->offset = offset; + mas->node = prev_node; return NULL; } -- 2.50.1