From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Mon, 3 Apr 2023 15:59:40 +0000 (-0400)
Subject: mas_walk changes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7e0d2c0fa965dd07d1253f81b2d102a7931c3a11;p=users%2Fjedix%2Flinux-maple.git

mas_walk changes

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index b5428f65a59cd..d76e0bb4366ac 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5124,24 +5124,25 @@ void *mas_walk(struct ma_state *mas)
 {
 	void *entry;
 
+	if (mas_is_none(mas) || mas_is_paused(mas))
+		mas->node = MAS_START;
 retry:
 	entry = mas_state_walk(mas);
-	if (mas_is_start(mas))
+	if (mas_is_start(mas)) {
 		goto retry;
-
-	if (mas_is_ptr(mas)) {
+	} else if (mas_is_none(mas)) {
+		mas->index = 0;
+		mas->last = ULONG_MAX;
+	} else if (mas_is_ptr(mas)) {
 		if (!mas->index) {
 			mas->last = 0;
-		} else {
-			mas->index = 1;
-			mas->last = ULONG_MAX;
+			return mas_root(mas);
 		}
-		return entry;
-	}
 
-	if (mas_is_none(mas)) {
-		mas->index = 0;
+		mas->index = 1;
 		mas->last = ULONG_MAX;
+		mas->node = MAS_NONE;
+		return NULL;
 	}
 
 	return entry;