Skip to content

Commit

Permalink
lib/maple_tree.c: fix build error due to hotfix alteration
Browse files Browse the repository at this point in the history
Commit 0de56e3 ("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
0de56e3, for 6.7-rc.

This fixlet undoes the damage.

Fixes: 0de56e3 ("maple_tree: use maple state end for write operations")
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Andrew Morton committed Dec 20, 2023
1 parent a721aea commit 5143eec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/maple_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -5477,7 +5477,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;
Expand Down

0 comments on commit 5143eec

Please sign in to comment.