From: Pedro Falcato <pfalc...@suse.de>

kfree() is a little shorter and works with kmem_cache_alloc'd pointers
too. Also lets us remove one more helper.

Signed-off-by: Pedro Falcato <pfalc...@suse.de>
Signed-off-by: Vlastimil Babka <vba...@suse.cz>
---
 lib/maple_tree.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 
d77e82362f03905040ac61630f92fe9af1e59f98..b361b484cfcaacd99472dd4c2b8de9260b307425
 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -181,11 +181,6 @@ static inline int mt_alloc_bulk(gfp_t gfp, size_t size, 
void **nodes)
        return kmem_cache_alloc_bulk(maple_node_cache, gfp, size, nodes);
 }
 
-static inline void mt_free_one(struct maple_node *node)
-{
-       kmem_cache_free(maple_node_cache, node);
-}
-
 static inline void mt_free_bulk(size_t size, void __rcu **nodes)
 {
        kmem_cache_free_bulk(maple_node_cache, size, (void **)nodes);
@@ -5274,7 +5269,7 @@ static void mt_free_walk(struct rcu_head *head)
        mt_free_bulk(node->slot_len, slots);
 
 free_leaf:
-       mt_free_one(node);
+       kfree(node);
 }
 
 static inline void __rcu **mte_destroy_descend(struct maple_enode **enode,
@@ -5358,7 +5353,7 @@ static void mt_destroy_walk(struct maple_enode *enode, 
struct maple_tree *mt,
 
 free_leaf:
        if (free)
-               mt_free_one(node);
+               kfree(node);
        else
                mt_clear_meta(mt, node, node->type);
 }
@@ -5585,7 +5580,7 @@ void mas_destroy(struct ma_state *mas)
                        mt_free_bulk(count, (void __rcu **)&node->slot[1]);
                        total -= count;
                }
-               mt_free_one(ma_mnode_ptr(node));
+               kfree(ma_mnode_ptr(node));
                total--;
        }
 
@@ -6635,7 +6630,7 @@ static void mas_dup_free(struct ma_state *mas)
        }
 
        node = mte_to_node(mas->node);
-       mt_free_one(node);
+       kfree(node);
 }
 
 /*

-- 
2.51.0


Reply via email to