[6.6,20/28] lib/maple_tree.c: fix build error due to hotfix alteration

Commit Message

Yu Kuai Oct. 24, 2024, 1:22 p.m. UTC

From: Andrew Morton <[e-mail]>

commit 5143eecd2af2b5424f7b96d53f17bb4718e46bd3 upstream.

Commit 0de56e38b307 ("maple_tree: use maple state end for write
operations") was broken by a later patch "maple_tree: do not preallocate
nodes for slot stores".  But the later patch was scheduled ahead of
0de56e38b307, for 6.7-rc.

This fixlet undoes the damage.

Fixes: 0de56e38b307 ("maple_tree: use maple state end for write operations")
Cc: Liam R. Howlett <[e-mail]>
Cc: Sidhartha Kumar <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Signed-off-by: Yu Kuai <[e-mail]>
---
 lib/maple_tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index d90f4b7e7511..905fa1143f8d 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5524,7 +5524,7 @@  int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
 	node_size = mas_wr_new_end(&wr_mas);
 
 	/* Slot store, does not require additional nodes */
-	if (node_size == wr_mas.node_end) {
+	if (node_size == mas->end) {
 		/* reuse node */
 		if (!mt_in_rcu(mas->tree))
 			return 0;