Using kvfree_rcu() to free the old shrinker_maps instead of call_rcu().
We don't have to define a dedicated callback for call_rcu() anymore.

Acked-by: Roman Gushchin <g...@fb.com>
Acked-by: Kirill Tkhai <ktk...@virtuozzo.com>
Reviewed-by: Shakeel Butt <shake...@google.com>
Signed-off-by: Yang Shi <shy828...@gmail.com>
---
 mm/vmscan.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 641a0b8b4ea9..bbe13985ae05 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -192,11 +192,6 @@ static inline int shrinker_map_size(int nr_items)
        return (DIV_ROUND_UP(nr_items, BITS_PER_LONG) * sizeof(unsigned long));
 }
 
-static void free_shrinker_map_rcu(struct rcu_head *head)
-{
-       kvfree(container_of(head, struct memcg_shrinker_map, rcu));
-}
-
 static int expand_one_shrinker_map(struct mem_cgroup *memcg,
                                   int size, int old_size)
 {
@@ -220,7 +215,7 @@ static int expand_one_shrinker_map(struct mem_cgroup *memcg,
                memset((void *)new->map + old_size, 0, size - old_size);
 
                rcu_assign_pointer(pn->shrinker_map, new);
-               call_rcu(&old->rcu, free_shrinker_map_rcu);
+               kvfree_rcu(old, rcu);
        }
 
        return 0;
-- 
2.26.2

Reply via email to