From 6084df644a611844f86ce3021d2c43a7924b2260 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Tue, 8 Sep 2020 13:40:10 -0400 Subject: [PATCH] maple_tree: Drop mte_get_slot(), _mte_get_slot(), ma_get_slot() and use mas_get_slots most places. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index dcb0f2db1615..18e38eae0085 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -583,33 +583,13 @@ static inline void __rcu **ma_get_slots(struct maple_node *mn, } } -static inline struct maple_enode *ma_get_slot( - struct maple_node *mn, unsigned char offset, - enum maple_type type, struct maple_tree *mtree) -{ - void **slots = ma_get_slots(mn, type); - - return rcu_dereference_check(slots[offset], - lockdep_is_held(&mtree->ma_lock)); -} - -static inline struct maple_enode *_mte_get_slot( - struct maple_enode *mn, unsigned char slot, - enum maple_type type, struct maple_tree *mtree) -{ - return ma_get_slot(mte_to_node(mn), slot, type, mtree); -} - -static inline struct maple_enode *mte_get_slot(struct maple_enode *mn, - unsigned char slot, struct maple_tree *mtree) -{ - return _mte_get_slot(mn, slot, mte_node_type(mn), mtree); -} - static inline struct maple_enode *mas_get_slot(struct ma_state *mas, - unsigned char slot) + unsigned char offset) { - return mte_get_slot(mas->node, slot, mas->tree); + void **slots = ma_get_slots(mte_to_node(mas->node), + mte_node_type(mas->node)); + return rcu_dereference_check(slots[offset], + lockdep_is_held(mas->tree->ma_lock)); } /* -- 2.50.1