Commit 14a405c3 authored by Lu Jialin's avatar Lu Jialin Committed by Andrew Morton
Browse files

memcg: remove duplication detection for mem_cgroup_uncharge_swap 

__mem_cgroup_uncharge_swap is only called in mem_cgroup_uncharge_swap, if
mem cgroup is disabled, __mem_cgroup_uncharge_swap cannot be called. 
Therefore, there is no need to judge whether mem_cgroup is disabled or
not.

Link: https://lkml.kernel.org/r/20230819081302.1217098-1-lujialin4@huawei.com


Signed-off-by: default avatarLu Jialin <lujialin4@huawei.com>
Acked-by: default avatarShakeel Butt <shakeelb@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 07e09c48

mm/memcontrol.c

+0 −3
Original line number Diff line number Diff line
@@ -7535,9 +7535,6 @@ void __mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_pages) 
	struct mem_cgroup *memcg;

	unsigned short id;



	if (mem_cgroup_disabled())

		return;



	id = swap_cgroup_record(entry, 0, nr_pages);

	rcu_read_lock();

	memcg = mem_cgroup_from_id(id);