From 060dd7f38257deaffa647dfc6ded2979a7d3b852 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Mon, 25 Aug 2025 16:38:33 -0400 Subject: [PATCH] drop mast from spanning rebalance Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index a59f74c9050b..6cdc94069388 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -3481,9 +3481,9 @@ static void mas_spanning_rebalance(struct ma_state *mas, } -static noinline void mas_wr_spanning_rebalance(struct ma_state *mas, - struct maple_subtree_state *mast, unsigned char height, - struct ma_wr_state *l_wr_mas, struct ma_wr_state *r_wr_mas) +static inline void mas_wr_spanning_rebalance(struct ma_state *mas, + unsigned char height, struct ma_wr_state *l_wr_mas, + struct ma_wr_state *r_wr_mas) { struct maple_enode *old_enode; struct ma_state sib; @@ -4300,7 +4300,6 @@ done: */ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas) { - struct maple_subtree_state mast; struct ma_state *mas; unsigned char height; @@ -4367,10 +4366,7 @@ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas) return mas_new_root(mas, wr_mas->entry); } - mast.orig_l = &l_mas; - mast.orig_r = &r_mas; - mas_wr_spanning_rebalance(mas, &mast, height + 1, &l_wr_mas, - &r_wr_mas); + mas_wr_spanning_rebalance(mas, height + 1, &l_wr_mas, &r_wr_mas); } /* -- 2.51.0