The quilt patch titled
Subject: maple_tree: update forking to separate maple state and node
has been removed from the -mm tree. Its filename was
maple_tree-separate-ma_state-node-from-status-fix-2.patch
This patch was dropped because it was folded into maple_tree-separate-ma_state-node-from-status.patch
------------------------------------------------------
From: "Liam R. Howlett" <Liam.Howlett@xxxxxxxxxx>
Subject: maple_tree: update forking to separate maple state and node
Date: Mon, 6 Nov 2023 10:45:51 -0500
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@xxxxxxxxxx
Signed-off-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
Cc: Peng Zhang <zhangpeng.00@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/maple_tree.c | 2 +-
tools/testing/radix-tree/maple.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/lib/maple_tree.c~maple_tree-separate-ma_state-node-from-status-fix-2
+++ a/lib/maple_tree.c
@@ -6693,7 +6693,7 @@ static inline void mas_dup_build(struct
node = mt_alloc_one(gfp);
if (!node) {
- new_mas->node = MAS_NONE;
+ new_mas->status = ma_none;
mas_set_err(mas, -ENOMEM);
return;
}
--- a/tools/testing/radix-tree/maple.c~maple_tree-separate-ma_state-node-from-status-fix-2
+++ a/tools/testing/radix-tree/maple.c
@@ -35956,7 +35956,7 @@ static int __init compare_tree(struct ma
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 ma
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;
}
_
Patches currently in -mm which might be from Liam.Howlett@xxxxxxxxxx are
maple_tree-remove-unnecessary-default-labels-from-switch-statements.patch
maple_tree-make-mas_erase-more-robust.patch
maple_tree-move-debug-check-to-__mas_set_range.patch
maple_tree-add-end-of-node-tracking-to-the-maple-state.patch
maple_tree-use-cached-node-end-in-mas_next.patch
maple_tree-use-cached-node-end-in-mas_destroy.patch
maple_tree-clean-up-inlines-for-some-functions.patch
maple_tree-separate-ma_state-node-from-status.patch
maple_tree-separate-ma_state-node-from-status-fix.patch
maple_tree-remove-mas_searchable.patch
maple_tree-use-maple-state-end-for-write-operations.patch
maple_tree-dont-find-node-end-in-mtree_lookup_walk.patch
maple_tree-mtree_range_walk-clean-up.patch
