maple_tree-move-up-mas_wr_store_setup-and-mas_wr_prealloc_setup.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: move up mas_wr_store_setup() and mas_wr_prealloc_setup()
has been removed from the -mm tree. Its filename was
maple_tree-move-up-mas_wr_store_setup-and-mas_wr_prealloc_setup.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: Sidhartha Kumar <[email protected]>
Subject: maple_tree: move up mas_wr_store_setup() and mas_wr_prealloc_setup()
Date: Wed, 14 Aug 2024 12:19:30 -0400
Subsequent patches require these definitions to be higher, no functional changes intended.
Signed-off-by Sidhartha Kumar <[email protected]>
Reviewed-by Liam R. Howlett <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
lib/maple_tree.c | 96 ++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 48 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-move-up-mas_wr_store_setup-and-mas_wr_prealloc_setup +48 -48
@@ -4227,6 +4227,54 @@ static inline void mas_wr_store_entry(stmas_wr_modify (wr_mas); } +static void mas_wr_store_setup (struct ma_wr_state *wr_mas) +{ +if (!mas_is_active (wr_mas->mas)) { +if (mas_is_start (wr_mas->mas)) +return ; + +if (unlikely (mas_is_paused (wr_mas->mas))) + goto reset; + +if (unlikely (mas_is_none (wr_mas->mas))) + goto reset; + +if (unlikely (mas_is_overflow (wr_mas->mas))) + goto reset; + +if (unlikely (mas_is_underflow (wr_mas->mas))) + goto reset; + } + +/* +* A less strict version of mas_is_span_wr() where we allow spanning +* writes within this node. This is to stop partial walks in +* mas_prealloc() from being reset. +*/ +if (wr_mas->mas->last > wr_mas->mas->max) + goto reset; + +if (wr_mas->entry) +return ; + +if (mte_is_leaf (wr_mas->mas->node) && + wr_mas->mas->last == wr_mas->mas->max) + goto reset; + +return ; + +reset: +mas_reset (wr_mas->mas); +} + +static inline void mas_wr_prealloc_setup (struct ma_wr_state *wr_mas) +{ +struct ma_state *mas = wr_mas->mas; + +mas_wr_store_setup (wr_mas); + wr_mas->content =mas_start (mas); +} +/** * mas_insert() - Internal call to insert a value * @mas: The maple state
@@ -5358,54 +5406,6 @@ static inline void mte_destroy_walk(strumt_destroy_walk (enode, mt, true); } } - -static void mas_wr_store_setup (struct ma_wr_state *wr_mas) -{ -if (!mas_is_active (wr_mas->mas)) { -if (mas_is_start (wr_mas->mas)) -return ; - -if (unlikely (mas_is_paused (wr_mas->mas))) - goto reset; - -if (unlikely (mas_is_none (wr_mas->mas))) - goto reset; - -if (unlikely (mas_is_overflow (wr_mas->mas))) - goto reset; - -if (unlikely (mas_is_underflow (wr_mas->mas))) - goto reset; - } - -/* -* A less strict version of mas_is_span_wr() where we allow spanning -* writes within this node. This is to stop partial walks in -* mas_prealloc() from being reset. -*/ -if (wr_mas->mas->last > wr_mas->mas->max) - goto reset; - -if (wr_mas->entry) -return ; - -if (mte_is_leaf (wr_mas->mas->node) && - wr_mas->mas->last == wr_mas->mas->max) - goto reset; - -return ; - -reset: -mas_reset (wr_mas->mas); -} - -static inline void mas_wr_prealloc_setup (struct ma_wr_state *wr_mas) -{ -struct ma_state *mas = wr_mas->mas; - -mas_wr_store_setup (wr_mas); - wr_mas->content =mas_start (mas); -}/* Interface */ /**
_
Patches currently in -mm which might be from [email protected] are