From: Liam R. Howlett Date: Mon, 25 Aug 2025 20:40:54 +0000 (-0400) Subject: drop wr_l_mas and l_mas from mas_wr_spanning_store X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=40bac43b5cff41770ed89475c9ae2829216a554a;p=users%2Fjedix%2Flinux-maple.git drop wr_l_mas and l_mas from mas_wr_spanning_store Signed-off-by: Liam R. Howlett --- diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 6cdc94069388..f567e283e7e2 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4304,10 +4304,8 @@ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas) unsigned char height; /* Left and Right side of spanning store */ - MA_STATE(l_mas, NULL, 0, 0); MA_STATE(r_mas, NULL, 0, 0); MA_WR_STATE(r_wr_mas, &r_mas, wr_mas->entry); - MA_WR_STATE(l_wr_mas, &l_mas, wr_mas->entry); /* * A store operation that spans multiple nodes is called a spanning @@ -4350,23 +4348,20 @@ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas) BUG_ON(!r_mas.end); /* Set up left side. */ - l_mas = *mas; - mas_wr_walk_index(&l_wr_mas); + mas_wr_walk_index(wr_mas); if (!wr_mas->entry) { - mas_extend_spanning_null(&l_wr_mas, &r_wr_mas); - mas->offset = l_mas.offset; - mas->index = l_mas.index; - mas->last = l_mas.last = r_mas.last; + mas_extend_spanning_null(wr_mas, &r_wr_mas); + mas->last = r_mas.last; } /* expanding NULLs may make this cover the entire range */ - if (!l_mas.index && r_mas.last == ULONG_MAX) { + if (!mas->index && r_mas.last == ULONG_MAX) { mas_set_range(mas, 0, ULONG_MAX); return mas_new_root(mas, wr_mas->entry); } - mas_wr_spanning_rebalance(mas, height + 1, &l_wr_mas, &r_wr_mas); + mas_wr_spanning_rebalance(mas, height + 1, wr_mas, &r_wr_mas); } /*