diff options
| author |   Roman Gushchin <roman.gushchin@linux.dev> | 2024-06-28 21:03:12 +0000 |
|---|---|---|
| committer |   Andrew Morton <akpm@linux-foundation.org> | 2024-07-04 18:05:56 -0700 |
| commit | b5855a26dedf210bcc1deb4cb30f9f657571a28a (patch) | |
| tree | 4dab01c3d7985ceaafefc09b48b0e80cab6aa9ad /mm/memcontrol.c | |
| parent | mm: memcg: guard cgroup v1-specific code in mem_cgroup_print_oom_meminfo() (diff) | |
| download | linux-rng-b5855a26dedf210bcc1deb4cb30f9f657571a28a.tar.xz linux-rng-b5855a26dedf210bcc1deb4cb30f9f657571a28a.zip | |
mm: memcg: gather memcg1-specific fields initialization in memcg1_memcg_init()
Gather all memcg1-specific struct mem_cgroup's members initialization in a
new memcg1_memcg_init() function, defined in mm/memcontrol-v1.c.
Obviously, if CONFIG_MEMCG_V1 is not set, there is no need to initialize
these fields, so the function becomes trivial.
Link: https://lkml.kernel.org/r/20240628210317.272856-5-roman.gushchin@linux.dev
Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | mm/memcontrol.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c6a5b0c60247..d1ae097f0351 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3589,13 +3589,9 @@ static struct mem_cgroup *mem_cgroup_alloc(struct mem_cgroup *parent) goto fail; INIT_WORK(&memcg->high_work, high_work_func); - INIT_LIST_HEAD(&memcg->oom_notify); - mutex_init(&memcg->thresholds_lock); - spin_lock_init(&memcg->move_lock); vmpressure_init(&memcg->vmpressure); - INIT_LIST_HEAD(&memcg->event_list); - spin_lock_init(&memcg->event_list_lock); memcg->socket_pressure = jiffies; + memcg1_memcg_init(memcg); #ifdef CONFIG_MEMCG_KMEM memcg->kmemcg_id = -1; INIT_LIST_HEAD(&memcg->objcg_list); |