maple_tree-convert-mas_insert-to-preallocate-nodes.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: convert mas_insert() to preallocate nodes
has been removed from the -mm tree. Its filename was
maple_tree-convert-mas_insert-to-preallocate-nodes.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: convert mas_insert() to preallocate nodes
Date: Wed, 14 Aug 2024 12:19:37 -0400
By setting the store type in mas_insert(), we no longer need to use mas_wr_modify() to determine the correct store function to use. Instead, set the store type and call mas_wr_store_entry(). Also, pass in the requested gfp flags to mas_insert() so they can be passed to the call to mas_wr_preallocate().
---
lib/maple_tree.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-convert-mas_insert-to-preallocate-nodes +10 -12
@@ -4457,26 +4457,24 @@ static inline void *mas_insert(struct maif (wr_mas.content) goto exists; -if (mas_is_none (mas) ||mas_is_ptr (mas)) { -mas_store_root (mas, entry); +mas_wr_preallocate (&wr_mas, entry); +if (mas_is_err (mas))return NULL ; - }/* spanning writes always overwrite something */ -if (!mas_wr_walk (&wr_mas)) +if (mas->store_type == wr_spanning_store) goto exists;/* At this point, we are at the leaf node that needs to be altered. */ - wr_mas.offset_end = mas->offset; - wr_mas.end_piv = wr_mas.r_max; - -if (wr_mas.content || (mas->last > wr_mas.r_max)) - goto exists; +if (mas->store_type != wr_new_root && mas->store_type != wr_store_root) { + wr_mas.offset_end = mas->offset; + wr_mas.end_piv = wr_mas.r_max; -if (!entry) -return NULL ; +if (wr_mas.content || (mas->last > wr_mas.r_max)) + goto exists; + } -mas_wr_modify (&wr_mas); +mas_wr_store_entry (&wr_mas);return wr_mas.content; exists:
_
Patches currently in -mm which might be from [email protected] are