kevin/linux
1
Fork 0
Code

maple_tree: change mas_adopt_children() parent usage

Browse Source 
All calls to mas_adopt_children() currently pass the parent as the node in
the maple state.  Allow for the parent pointer that is passed in to be
used instead.

Link: https://lkml.kernel.org/r/20230804165951.2661157-6-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Liam R. Howlett 2023-08-04 12:59:50 -04:00 committed by Andrew Morton
parent 4ffc2ee2cf
commit 068bafcac0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/maple_tree.c
View File

@ -1702,7 +1702,7 @@ static inline void mas_adopt_children(struct ma_state *mas,
struct maple_enode *parent) struct maple_enode *parent)
{ {
enum maple_type type = mte_node_type(parent); enum maple_type type = mte_node_type(parent);
struct maple_node *node = mas_mn(mas); struct maple_node *node = mte_to_node(parent);
void __rcu **slots = ma_slots(node, type); void __rcu **slots = ma_slots(node, type);
unsigned long *pivots = ma_pivots(node, type); unsigned long *pivots = ma_pivots(node, type);
struct maple_enode *child; struct maple_enode *child;