Commit a7b7e1df authored by Shakeel Butt's avatar Shakeel Butt Committed by Linus Torvalds

mm/list_lru.c: remove kvfree_rcu_local()

The list_lru file used to have local kvfree_rcu() which was renamed by
commit e0feed08 ("mm/list_lru.c: Rename kvfree_rcu() to local
variant") to introduce the globally visible kvfree_rcu().

Now we have global kvfree_rcu(), so remove the local kvfree_rcu_local()
and just use the global one.

Link: https://lkml.kernel.org/r/20210207152148.1285842-1-shakeelb@google.comSigned-off-by: default avatarShakeel Butt <shakeelb@google.com>
Reviewed-by: default avatarUladzislau Rezki <urezki@gmail.com>
Reviewed-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c41a40b6
...@@ -373,21 +373,13 @@ static void memcg_destroy_list_lru_node(struct list_lru_node *nlru) ...@@ -373,21 +373,13 @@ static void memcg_destroy_list_lru_node(struct list_lru_node *nlru)
struct list_lru_memcg *memcg_lrus; struct list_lru_memcg *memcg_lrus;
/* /*
* This is called when shrinker has already been unregistered, * This is called when shrinker has already been unregistered,
* and nobody can use it. So, there is no need to use kvfree_rcu_local(). * and nobody can use it. So, there is no need to use kvfree_rcu().
*/ */
memcg_lrus = rcu_dereference_protected(nlru->memcg_lrus, true); memcg_lrus = rcu_dereference_protected(nlru->memcg_lrus, true);
__memcg_destroy_list_lru_node(memcg_lrus, 0, memcg_nr_cache_ids); __memcg_destroy_list_lru_node(memcg_lrus, 0, memcg_nr_cache_ids);
kvfree(memcg_lrus); kvfree(memcg_lrus);
} }
static void kvfree_rcu_local(struct rcu_head *head)
{
struct list_lru_memcg *mlru;
mlru = container_of(head, struct list_lru_memcg, rcu);
kvfree(mlru);
}
static int memcg_update_list_lru_node(struct list_lru_node *nlru, static int memcg_update_list_lru_node(struct list_lru_node *nlru,
int old_size, int new_size) int old_size, int new_size)
{ {
...@@ -419,7 +411,7 @@ static int memcg_update_list_lru_node(struct list_lru_node *nlru, ...@@ -419,7 +411,7 @@ static int memcg_update_list_lru_node(struct list_lru_node *nlru,
rcu_assign_pointer(nlru->memcg_lrus, new); rcu_assign_pointer(nlru->memcg_lrus, new);
spin_unlock_irq(&nlru->lock); spin_unlock_irq(&nlru->lock);
call_rcu(&old->rcu, kvfree_rcu_local); kvfree_rcu(old, rcu);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment