[to-be-updated] maple_tree-add-helper-mas_make_walkable.patch removed from -mm tree
Andrew Morton <[email protected]>
| Newsgroups | org.kernel.vger.mm-commits |
|---|---|
| Message-ID | <[email protected]> |
The quilt patch titled
Subject: maple_tree: add helper mas_make_walkable()
has been removed from the -mm tree. Its filename was
maple_tree-add-helper-mas_make_walkable.patch
This patch was dropped because an updated version will be issued
------------------------------------------------------
From: "Liam R. Howlett (Oracle)" <[email protected]>
Subject: maple_tree: add helper mas_make_walkable()
Date: Tue, 30 Jun 2026 15:08:43 -0400
A check in mas_walk() was incorrect and caused inefficient use of the
maple state. The same issue existed in mas_erase(), but was left unfixed.
Making a helper function is the obvious answer.
Link: https://lore.kernel.org/[email protected]
Signed-off-by: Liam R. Howlett (Oracle) <[email protected]>
Cc: Boqun Feng <[email protected]>
Cc: Chris Mason <[email protected]>
Cc: Chuck Lever <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jason Gunthorpe <[email protected]>
Cc: Joe Perches <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: Waiman Long <[email protected]>
Cc: Will Deacon <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
lib/maple_tree.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--- a/lib/maple_tree.c~maple_tree-add-helper-mas_make_walkable
+++ a/lib/maple_tree.c
@@ -261,6 +261,12 @@ static inline bool mas_is_underflow(stru
return mas->status == ma_underflow;
}
+static inline void mas_make_walkable(struct ma_state *mas)
+{
+ if (!mas_is_active(mas) && !mas_is_start(mas))
+ mas->status = ma_start;
+}
+
static __always_inline struct maple_node *mte_to_node(
const struct maple_enode *entry)
{
@@ -4447,8 +4453,7 @@ void *mas_walk(struct ma_state *mas)
void *entry;
mas_may_init_lock_check(mas);
- if (!mas_is_active(mas) && !mas_is_start(mas))
- mas->status = ma_start;
+ mas_make_walkable(mas);
retry:
entry = mas_state_walk(mas);
if (mas_is_start(mas)) {
@@ -5684,9 +5689,7 @@ void *mas_erase(struct ma_state *mas)
if (mt_external_lock(mas->tree))
might_alloc(GFP_KERNEL);
- if (!mas_is_active(mas) || !mas_is_start(mas))
- mas->status = ma_start;
-
+ mas_make_walkable(mas);
write_retry:
entry = mas_state_walk(mas);
if (!entry)
_
Patches currently in -mm which might be from [email protected] are