Commit d0db7afa authored Jun 08, 2016 by Andrew Morton Committed by Linus Torvalds Jun 09, 2016

revert "mm: memcontrol: fix possible css ref leak on oom"

Revert commit 1383399d ("mm: memcontrol: fix possible css ref leak
on oom").  Johannes points out "There is a task_in_memcg_oom() check
before calling mem_cgroup_oom()".

Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 91a4c272

mm/memcontrol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1608,7 +1608,7 @@ static void memcg_oom_recover(struct mem_cgroup *memcg)

		static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
		{
		if (!current->memcg_may_oom \|\| current->memcg_in_oom)
		if (!current->memcg_may_oom)
		return;
		/*
		* We are in the middle of the charge context here, so we

Admin message