Commit 35ae834f authored by Ankita Garg's avatar Ankita Garg Committed by Linus Torvalds
Browse files

[PATCH] oom fix: prevent oom from killing a process with children/sibling unkillable



Looking at oom_kill.c, found that the intention to not kill the selected
process if any of its children/siblings has OOM_DISABLE set, is not being
met.
Signed-off-by: default avatarAnkita Garg <ankita@in.ibm.com>
Acked-by: default avatarNick Piggin <npiggin@suse.de>
Acked-by: default avatarWilliam Irwin <wli@holomorphy.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5d480ff
......@@ -320,7 +320,7 @@ static int oom_kill_task(struct task_struct *p)
* Don't kill the process if any threads are set to OOM_DISABLE
*/
do_each_thread(g, q) {
if (q->mm == mm && p->oomkilladj == OOM_DISABLE)
if (q->mm == mm && q->oomkilladj == OOM_DISABLE)
return 1;
} while_each_thread(g, q);
......
Markdown is supported
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