The patch titled
select_bad_process(): cleanup 'releasing' check
has been removed from the -mm tree. Its filename is
select_bad_process-cleanup-releasing-check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: select_bad_process(): cleanup 'releasing' check
From: Oleg Nesterov <oleg@xxxxxxxxxx>
No logic changes, but imho easier to read.
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Acked-by: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/oom_kill.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff -puN mm/oom_kill.c~select_bad_process-cleanup-releasing-check mm/oom_kill.c
--- a/mm/oom_kill.c~select_bad_process-cleanup-releasing-check
+++ a/mm/oom_kill.c
@@ -204,7 +204,6 @@ static struct task_struct *select_bad_pr
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_pr
* 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_pr
*ppoints = points;
}
} while_each_thread(g, p);
+
return chosen;
}
_
Patches currently in -mm which might be from oleg@xxxxxxxxxx are
origin.patch
git-block.patch
proc-readdir-race-fix-take-3-race-fix.patch
vt-rework-the-console-spawning-variables.patch
vt-make-vt_pid-a-struct-pid-making-it-pid-wrap-around-safe.patch
simplify-pid-iterators.patch
file-add-locking-to-f_getown.patch
proc-convert-task_sig-to-use-lock_task_sighand.patch
proc-convert-do_task_stat-to-use-lock_task_sighand.patch
proc-drop-tasklist-lock-in-task_state.patch
proc-properly-compute-tgid_offset.patch
proc-remove-trailing-blank-entry-from-pid_entry-arrays.patch
proc-remove-the-useless-smp-safe-comments-from-proc.patch
proc-comment-what-proc_fill_cache-does.patch
introduce-get_task_pid-to-fix-unsafe-get_pid.patch
rcu-simplify-improve-batch-tuning.patch
pidhash-temporary-debug-checks.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
