Skip to content

Commit 025f931

Browse files
heatdtehcaster
authored andcommitted
maple_tree: Replace mt_free_one() with kfree()
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 <[email protected]> Reviewed-by: Suren Baghdasaryan <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]>
1 parent 9b60811 commit 025f931

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

lib/maple_tree.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@ static inline int mt_alloc_bulk(gfp_t gfp, size_t size, void **nodes)
177177
return kmem_cache_alloc_bulk(maple_node_cache, gfp, size, nodes);
178178
}
179179

180-
static inline void mt_free_one(struct maple_node *node)
181-
{
182-
kmem_cache_free(maple_node_cache, node);
183-
}
184-
185180
static inline void mt_free_bulk(size_t size, void __rcu **nodes)
186181
{
187182
kmem_cache_free_bulk(maple_node_cache, size, (void **)nodes);
@@ -5092,7 +5087,7 @@ static void mt_free_walk(struct rcu_head *head)
50925087
mt_free_bulk(node->slot_len, slots);
50935088

50945089
free_leaf:
5095-
mt_free_one(node);
5090+
kfree(node);
50965091
}
50975092

50985093
static inline void __rcu **mte_destroy_descend(struct maple_enode **enode,
@@ -5176,7 +5171,7 @@ static void mt_destroy_walk(struct maple_enode *enode, struct maple_tree *mt,
51765171

51775172
free_leaf:
51785173
if (free)
5179-
mt_free_one(node);
5174+
kfree(node);
51805175
else
51815176
mt_clear_meta(mt, node, node->type);
51825177
}
@@ -5385,7 +5380,7 @@ void mas_destroy(struct ma_state *mas)
53855380
mt_free_bulk(count, (void __rcu **)&node->slot[1]);
53865381
total -= count;
53875382
}
5388-
mt_free_one(ma_mnode_ptr(node));
5383+
kfree(ma_mnode_ptr(node));
53895384
total--;
53905385
}
53915386

@@ -6373,7 +6368,7 @@ static void mas_dup_free(struct ma_state *mas)
63736368
}
63746369

63756370
node = mte_to_node(mas->node);
6376-
mt_free_one(node);
6371+
kfree(node);
63776372
}
63786373

63796374
/*

0 commit comments

Comments
 (0)