maple_tree: update forking to separate maple state and node

Just a small change to the forking code after rebasing the maple status
changes on top.

Link: https://lkml.kernel.org/r/20231106154551.615042-1-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Peng Zhang <zhangpeng.00@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 3bed0b5c044d587ea5ac47da01e3c24f2aed8682..38e5ec57e49c7a23e76b1f46c4cb9a84c9613fb3 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6693,7 +6693,7 @@ static inline void mas_dup_build(struct ma_state *mas, struct ma_state *new_mas,
 
        node = mt_alloc_one(gfp);
        if (!node) {
-               new_mas->node = MAS_NONE;
+               new_mas->status = ma_none;
                mas_set_err(mas, -ENOMEM);
                return;
        }

diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index 5d1c2852e2ad322c1b541e4dbabb9f5eeb5ef7b6..857c439e6bbc2c253034795ffabeb999ba49938b 100644 (file)
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -35956,7 +35956,7 @@ static int __init compare_tree(struct maple_tree *mt_a, struct maple_tree *mt_b)
 
        if (mas_is_ptr(&mas_a) || mas_is_ptr(&mas_b)) {
                if (!(mas_is_ptr(&mas_a) && mas_is_ptr(&mas_b))) {
-                       pr_err("One is MAS_ROOT and the other is not.\n");
+                       pr_err("One is ma_root and the other is not.\n");
                        return -1;
                }
                return 0;
@@ -35965,7 +35965,7 @@ static int __init compare_tree(struct maple_tree *mt_a, struct maple_tree *mt_b)
        while (!mas_is_none(&mas_a) || !mas_is_none(&mas_b)) {
 
                if (mas_is_none(&mas_a) || mas_is_none(&mas_b)) {
-                       pr_err("One is MAS_NONE and the other is not.\n");
+                       pr_err("One is ma_none and the other is not.\n");
                        return -1;
                }