kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] select_bad_process(): cleanup 'releasing' check

Browse source 
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>
This commit is contained in:
Oleg Nesterov 2006-09-29 02:01:12 -07:00 committed by Linus Torvalds
parent 28324d1df6
commit 972c4ea59c
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mm/oom_kill.c
View file

@ -204,7 +204,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
do_posix_clock_monotonic_gettime(&uptime); do_posix_clock_monotonic_gettime(&uptime);
do_each_thread(g, p) { do_each_thread(g, p) {
unsigned long points; unsigned long points;
int releasing;
/* /*
* skip kernel threads and tasks which have already released * 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. * the process of exiting and releasing its resources.
* Otherwise we could get an OOM deadlock. * Otherwise we could get an OOM deadlock.
*/ */
releasing = test_tsk_thread_flag(p, TIF_MEMDIE) || if ((p->flags & PF_EXITING) && p == current) {
p->flags & PF_EXITING; chosen = p;
if (releasing) { *ppoints = ULONG_MAX;
if (p->flags & PF_EXITING && p == current) { break;
chosen = p;
*ppoints = ULONG_MAX;
break;
}
return ERR_PTR(-1UL);
} }
if ((p->flags & PF_EXITING) ||
test_tsk_thread_flag(p, TIF_MEMDIE))
return ERR_PTR(-1UL);
if (p->oomkilladj == OOM_DISABLE) if (p->oomkilladj == OOM_DISABLE)
continue; continue;
@ -245,6 +243,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
*ppoints = points; *ppoints = points;
} }
} while_each_thread(g, p); } while_each_thread(g, p);
return chosen; return chosen;
} }