From: Ankita Garg <ankita@in.ibm.com>
Date: Fri, 16 Mar 2007 21:38:33 +0000 (-0800)
Subject: [PATCH] oom fix: prevent oom from killing a process with children/sibling unkillable
X-Git-Tag: v2.6.21-rc5~80
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35ae834fa02ba89cfbd4a80892c0e458fd6d5c0b;p=linux-2.6

[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: Ankita Garg <ankita@in.ibm.com>
Acked-by: Nick Piggin <npiggin@suse.de>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b278b8d60e..2f3916986a 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -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);