Commit 7a52d4d8 authored Oct 13, 2020 by Miaohe Lin Committed by Linus Torvalds Oct 13, 2020

mm: memcontrol: reword obsolete comment of mem_cgroup_unmark_under_oom()



Since commit 79dfdacc ("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>

parent d437024e

mm/memcontrol.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1826,8 +1826,8 @@ static void mem_cgroup_unmark_under_oom(struct mem_cgroup *memcg)
		struct mem_cgroup *iter;

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

Admin message