Skip to content

Commit 7a52d4d

Browse files
MiaoheLintorvalds
authored andcommitted
mm: memcontrol: reword obsolete comment of mem_cgroup_unmark_under_oom()
Since commit 79dfdac ("memcg: make oom_lock 0 and 1 based rather than counter"), the mem_cgroup_unmark_under_oom() is added and the comment of the mem_cgroup_oom_unlock() is moved here. But this comment make no sense here because mem_cgroup_oom_lock() does not operate on under_oom field. So we reword the comment as this would be helpful. [Thanks Michal Hocko for rewording this comment.] Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Vladimir Davydov <vdavydov.dev@gmail.com> Link: https://lkml.kernel.org/r/20200930095336.21323-1-linmiaohe@huawei.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent d437024 commit 7a52d4d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mm/memcontrol.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,8 +1826,8 @@ static void mem_cgroup_unmark_under_oom(struct mem_cgroup *memcg)
18261826
struct mem_cgroup *iter;
18271827

18281828
/*
1829-
* When a new child is created while the hierarchy is under oom,
1830-
* mem_cgroup_oom_lock() may not be called. Watch for underflow.
1829+
* Be careful about under_oom underflows becase a child memcg
1830+
* could have been added after mem_cgroup_mark_under_oom.
18311831
*/
18321832
spin_lock(&memcg_oom_lock);
18331833
for_each_mem_cgroup_tree(iter, memcg)

0 commit comments

Comments
 (0)