maple_tree-reorder-mas-store_type-case-statements.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: reorder mas->store_type case statements
has been removed from the -mm tree. Its filename was
maple_tree-reorder-mas-store_type-case-statements.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: reorder mas->store_type case statements
Date: Thu, 10 Apr 2025 19:14:46 +0000
Move the unlikely case that mas->store_type is invalid to be the last evaluated case and put liklier cases higher up.
Signed-off-by Sidhartha Kumar <[email protected]>
Suggested-by Liam R. Howlett <[email protected]>
Reviewed-by Liam R. Howlett <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Wei Yang <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
lib/maple_tree.c | 51 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 26 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-reorder-mas-store_type-case-statements +25 -26
@@ -4083,15 +4083,6 @@ static inline void mas_wr_store_entry(stunsigned char new_end =mas_wr_new_end (wr_mas);switch (mas->store_type) { -case wr_invalid: -MT_BUG_ON (mas->tree,1 ); -return ; -case wr_new_root: -mas_new_root (mas, wr_mas->entry); -break ; -case wr_store_root: -mas_store_root (mas, wr_mas->entry); -break ;case wr_exact_fit:rcu_assign_pointer (wr_mas->slots[mas->offset], wr_mas->entry);if (!!wr_mas->entry ^ !!wr_mas->content)
@@ -4113,6 +4104,14 @@ static inline void mas_wr_store_entry(stcase wr_rebalance:mas_wr_bnode (wr_mas);break ; +case wr_new_root: +mas_new_root (mas, wr_mas->entry); +break ; +case wr_store_root: +mas_store_root (mas, wr_mas->entry); +break ; +case wr_invalid: +MT_BUG_ON (mas->tree,1 ); }return ;
@@ -4177,19 +4176,10 @@ static inline int mas_prealloc_calc(struunsigned char delta = height - wr_mas->vacant_height;switch (mas->store_type) { -case wr_invalid: -WARN_ON_ONCE (1 ); -break ; -case wr_new_root: - ret =1 ; -break ; -case wr_store_root: -if (likely ((mas->last !=0 ) || (mas->index !=0 ))) - ret =1 ; -else if (((unsigned long ) (entry) &3 ) ==2 ) - ret =1 ; -else - ret =0 ; +case wr_exact_fit: +case wr_append: +case wr_slot_store: + ret =0 ;break ;case wr_spanning_store:if (wr_mas->sufficient_height < wr_mas->vacant_height)
@@ -4209,10 +4199,19 @@ static inline int mas_prealloc_calc(strucase wr_node_store: ret =mt_in_rcu (mas->tree) ?1 :0 ;break ; -case wr_append: -case wr_exact_fit: -case wr_slot_store: - ret =0 ; +case wr_new_root: + ret =1 ; +break ; +case wr_store_root: +if (likely ((mas->last !=0 ) || (mas->index !=0 ))) + ret =1 ; +else if (((unsigned long ) (entry) &3 ) ==2 ) + ret =1 ; +else + ret =0 ; +break ; +case wr_invalid: +WARN_ON_ONCE (1 ); }return ret;
_
Patches currently in -mm which might be from [email protected] are