The quilt patch titled
Subject: maple_tree: use ma_data_end() in mas_data_end()
has been removed from the -mm tree. Its filename was
maple_tree-use-ma_data_end-in-mas_data_end.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Wei Yang <richard.weiyang@xxxxxxxxx>
Subject: maple_tree: use ma_data_end() in mas_data_end()
Date: Sat, 31 Aug 2024 00:10:51 +0000
These two function share almost the same code and do the same thing.
Let's just call ma_data_end() in mas_data_end() to reduce duplicate
code.
Link: https://lkml.kernel.org/r/20240831001053.4751-1-richard.weiyang@xxxxxxxxx
Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxx>
Cc: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/maple_tree.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
--- a/lib/maple_tree.c~maple_tree-use-ma_data_end-in-mas_data_end
+++ a/lib/maple_tree.c
@@ -1420,28 +1420,14 @@ static __always_inline unsigned char ma_
*/
static inline unsigned char mas_data_end(struct ma_state *mas)
{
- enum maple_type type;
- struct maple_node *node;
- unsigned char offset;
- unsigned long *pivots;
+ enum maple_type type = mte_node_type(mas->node);
+ struct maple_node *node = mas_mn(mas);
+ unsigned long *pivots = ma_pivots(node, type);
- type = mte_node_type(mas->node);
- node = mas_mn(mas);
- if (type == maple_arange_64)
- return ma_meta_end(node, type);
-
- pivots = ma_pivots(node, type);
if (unlikely(ma_dead_node(node)))
return 0;
- offset = mt_pivots[type] - 1;
- if (likely(!pivots[offset]))
- return ma_meta_end(node, type);
-
- if (likely(pivots[offset] == mas->max))
- return offset;
-
- return mt_pivots[type];
+ return ma_data_end(node, type, pivots, mas->max);
}
/*
_
Patches currently in -mm which might be from richard.weiyang@xxxxxxxxx are
maple_tree-arange64-node-is-not-a-leaf-node.patch
maple_tree-dump-error-message-based-on-format.patch
maple_tree-cleanup-function-descriptions.patch
maple_tree-fix-comment-typo-on-ma_flag-of-allocation-tree.patch
maple_tree-use-mas_safe_pivot-to-get-the-pivot-range.patch
maple_tree-local-variable-count-is-not-necessary.patch
