maple_tree-move-mas_wr_end_piv-below-mas_wr_extend_null.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: move mas_wr_end_piv() below mas_wr_extend_null()
has been removed from the -mm tree. Its filename was
maple_tree-move-mas_wr_end_piv-below-mas_wr_extend_null.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Liam R. Howlett" <[email protected]>
Subject: maple_tree: move mas_wr_end_piv() below mas_wr_extend_null()
Date: Mon, 24 Jul 2023 14:31:53 -0400
Relocate it and call mas_wr_extend_null() from within mas_wr_end_piv(). Extending the NULL may affect the end pivot value so call mas_wr_endtend_null() from within mas_wr_end_piv() to keep it all together.
---
lib/maple_tree.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-move-mas_wr_end_piv-below-mas_wr_extend_null +15 -16
@@ -4180,18 +4180,6 @@ static inline bool mas_wr_slot_store(strreturn true; } -static inline void mas_wr_end_piv (struct ma_wr_state *wr_mas) -{ -while ((wr_mas->offset_end < wr_mas->node_end) && - (wr_mas->mas->last > wr_mas->pivots[wr_mas->offset_end])) - wr_mas->offset_end++; - -if (wr_mas->offset_end < wr_mas->node_end) - wr_mas->end_piv = wr_mas->pivots[wr_mas->offset_end]; -else - wr_mas->end_piv = wr_mas->mas->max; -} -static inline void mas_wr_extend_null (struct ma_wr_state *wr_mas) {struct ma_state *mas = wr_mas->mas;
@@ -4228,6 +4216,21 @@ static inline void mas_wr_extend_null(st } } +static inline void mas_wr_end_piv (struct ma_wr_state *wr_mas) +{ +while ((wr_mas->offset_end < wr_mas->node_end) && + (wr_mas->mas->last > wr_mas->pivots[wr_mas->offset_end])) + wr_mas->offset_end++; + +if (wr_mas->offset_end < wr_mas->node_end) + wr_mas->end_piv = wr_mas->pivots[wr_mas->offset_end]; +else + wr_mas->end_piv = wr_mas->mas->max; + +if (!wr_mas->entry) +mas_wr_extend_null (wr_mas); +} +static inline unsigned char mas_wr_new_end (struct ma_wr_state *wr_mas) {struct ma_state *mas = wr_mas->mas;
@@ -4371,10 +4374,6 @@ static inline void *mas_wr_store_entry(s/* At this point, we are at the leaf node that needs to be altered. */ mas_wr_end_piv (wr_mas); - -if (!wr_mas->entry) -mas_wr_extend_null (wr_mas); -/* New root for a single pointer */ if (unlikely (!mas->index && mas->last ==ULONG_MAX )) {mas_new_root (mas, wr_mas->entry);
_
Patches currently in -mm which might be from [email protected] are
maple_tree-add-hex-output-to-maple_arange64-dump.patch maple_tree-reorder-replacement-of-nodes-to-avoid-live-lock.patch maple_tree-introduce-mas_put_in_tree.patch maple_tree-introduce-mas_tree_parent-definition.patch maple_tree-change-mas_adopt_children-parent-usage.patch maple_tree-replace-data-before-marking-dead-in-split-and-spanning-store.patch