diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2006-09-29 11:01:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 18:18:21 +0200 |
| commit | 972c4ea59c9dbf82647ee9665d9e945241911a51 (patch) | |
| tree | 11f084b503b2b539e0dba3c18e69ccdf7d722052 /mm | |
| parent | [PATCH] select_bad_process(): kill a bogus PF_DEAD/TASK_DEAD check (diff) | |
| download | linux-972c4ea59c9dbf82647ee9665d9e945241911a51.tar.xz linux-972c4ea59c9dbf82647ee9665d9e945241911a51.zip | |
[PATCH] select_bad_process(): cleanup 'releasing' check
No logic changes, but imho easier to read.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/oom_kill.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 423dcae323a5..991bf0cf4778 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -204,7 +204,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) do_posix_clock_monotonic_gettime(&uptime); do_each_thread(g, p) { unsigned long points; - int releasing; /* * skip kernel threads and tasks which have already released @@ -226,16 +225,15 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) * the process of exiting and releasing its resources. * Otherwise we could get an OOM deadlock. */ - releasing = test_tsk_thread_flag(p, TIF_MEMDIE) || - p->flags & PF_EXITING; - if (releasing) { - if (p->flags & PF_EXITING && p == current) { - chosen = p; - *ppoints = ULONG_MAX; - break; - } - return ERR_PTR(-1UL); + if ((p->flags & PF_EXITING) && p == current) { + chosen = p; + *ppoints = ULONG_MAX; + break; } + if ((p->flags & PF_EXITING) || + test_tsk_thread_flag(p, TIF_MEMDIE)) + return ERR_PTR(-1UL); + if (p->oomkilladj == OOM_DISABLE) continue; @@ -245,6 +243,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) *ppoints = points; } } while_each_thread(g, p); + return chosen; } |