Commit d0db7afa authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

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: default avatarMichal Hocko <>
Cc: Johannes Weiner <>
Cc: Vladimir Davydov <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 91a4c272
......@@ -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)
* We are in the middle of the charge context here, so we
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment