summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLu Jialin <lujialin4@huawei.com>2023-08-19 08:13:02 +0000
committerAndrew Morton <akpm@linux-foundation.org>2023-08-24 16:20:29 -0700
commit14a405c3a933ce261147a60dfb8bf586b45ec9de (patch)
tree575499730c7de1854d667514a1ce32c0e64bb350 /mm
parent07e09c483cbef2a252f75d95670755a0607288f5 (diff)
downloadlwn-14a405c3a933ce261147a60dfb8bf586b45ec9de.tar.gz
lwn-14a405c3a933ce261147a60dfb8bf586b45ec9de.zip
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: Lu Jialin <lujialin4@huawei.com> Acked-by: Shakeel 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: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index cf57fe9318d5..0286bd0ab043 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -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);