Skip to content

Commit f4fe741

Browse files
Muchun Songjfvogel
authored andcommitted
mm: memcontrol: remove dead code and comments
Since no-hierarchy mode is deprecated after commit bef8620 ("mm: memcg: deprecate the non-hierarchical mode") so parent_mem_cgroup() cannot return a NULL except root memcg, however, root memcg cannot be offline, so it is safe to drop the check of returned value of parent_mem_cgroup(). Remove those dead code. The comments in memcg_offline_kmem() above memcg_reparent_list_lrus() are out of date since commit 5abc1e3 ("mm: list_lru: allocate list_lru_one only when needed") There is no ordering requirement between memcg_reparent_list_lrus() and memcg_reparent_objcgs(), so remove those outdated comments. Signed-off-by: Muchun Song <[email protected]> Acked-by: Roman Gushchin <[email protected]> Link: https://lore.kernel.org/all/[email protected]/ Orabug: 37405594 Conflicts: i. mm/vmscan.c (Due to 'commit 96f7b2b mm: vmscan: move shrinker-related code into a separate file', which moved shrinker related functions away from vmscan.c) ii. include/linux/memcontrol.h (Due to 'commit ca39c5e mm/memcg: update obsolete comment above parent_mem_cgroup()' - which fixed the comments above parent_mem_cgroup()) Signed-off-by: Imran Khan <[email protected]> Reviewed-by: Kamalesh Babulal <[email protected]>
1 parent b18fb7e commit f4fe741

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

mm/memcontrol.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3116,17 +3116,7 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
31163116
return;
31173117

31183118
parent = parent_mem_cgroup(memcg);
3119-
if (!parent)
3120-
parent = root_mem_cgroup;
3121-
31223119
memcg_reparent_objcgs(memcg, parent);
3123-
3124-
/*
3125-
* After we have finished memcg_reparent_objcgs(), all list_lrus
3126-
* corresponding to this cgroup are guaranteed to remain empty.
3127-
* The ordering is imposed by list_lru_node->lock taken by
3128-
* memcg_reparent_list_lrus().
3129-
*/
31303120
memcg_reparent_list_lrus(memcg, parent);
31313121
}
31323122

@@ -4951,8 +4941,6 @@ static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg)
49514941
break;
49524942
}
49534943
memcg = parent_mem_cgroup(memcg);
4954-
if (!memcg)
4955-
memcg = root_mem_cgroup;
49564944
}
49574945
return memcg;
49584946
}

mm/shrinker.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,10 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg)
286286
{
287287
int nid, index, offset;
288288
long nr;
289-
struct mem_cgroup *parent;
289+
struct mem_cgroup *parent = parent_mem_cgroup(memcg);
290290
struct shrinker_info *child_info, *parent_info;
291291
struct shrinker_info_unit *child_unit, *parent_unit;
292292

293-
parent = parent_mem_cgroup(memcg);
294-
if (!parent)
295-
parent = root_mem_cgroup;
296293

297294
/* Prevent from concurrent shrinker_info expand */
298295
mutex_lock(&shrinker_mutex);

0 commit comments

Comments
 (0)