summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2016-06-08 15:33:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-09 14:23:11 -0700
commitd0db7afa1b767d95e3e14632718da5a9794129bc (patch)
tree33199b28a619a675f46c88b0be5b7f11dbdefcab /mm
parent91a4c272145652d798035c17e1c02c91001d3f51 (diff)
downloadlinux-stable-d0db7afa1b767d95e3e14632718da5a9794129bc.tar.gz
linux-stable-d0db7afa1b767d95e3e14632718da5a9794129bc.tar.bz2
linux-stable-d0db7afa1b767d95e3e14632718da5a9794129bc.zip
revert "mm: memcontrol: fix possible css ref leak on oom"
Revert commit 1383399d7be0 ("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>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 58c69c94402a..75e74408cc8f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -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