imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-28 12:53:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

maple_tree: add helper mas_make_walkable()

Browse Source 
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: Breno Leitao <[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]>
This commit is contained in:
Liam R. Howlett (Oracle) authored and Andrew Morton committed 2026-08-24 18:43:32 -07:00
1 parent 4e4fe9d727
commit d17c749d32
1 file changed
+8 -5
Download Patch File Download Diff File Expand all files Collapse all files
lib/maple_tree.c
+8 -5
View File
@@ -261,6 +261,12 @@ static inline bool mas_is_underflow(struct ma_state *mas)
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)) {
@@ -5685,9 +5690,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)