On Tue 14-07-15 16:45:13, David Rientjes wrote: > The "killed" variable in out_of_memory() can be removed since the call to > oom_kill_process() where we should block to allow the process time to > exit is obvious. > > Signed-off-by: David Rientjes <[email protected]>
Acked-by: Michal Hocko <[email protected]> > --- > mm/oom_kill.c | 21 ++++++++------------- > 1 file changed, 8 insertions(+), 13 deletions(-) > > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -645,7 +645,6 @@ bool out_of_memory(struct oom_control *oc) > unsigned long freed = 0; > unsigned int uninitialized_var(points); > enum oom_constraint constraint = CONSTRAINT_NONE; > - int killed = 0; > > if (oom_killer_disabled) > return false; > @@ -653,7 +652,7 @@ bool out_of_memory(struct oom_control *oc) > blocking_notifier_call_chain(&oom_notify_list, 0, &freed); > if (freed > 0) > /* Got some memory back in the last second. */ > - goto out; > + return true; > > /* > * If current has a pending SIGKILL or is exiting, then automatically > @@ -666,7 +665,7 @@ bool out_of_memory(struct oom_control *oc) > if (current->mm && > (fatal_signal_pending(current) || task_will_free_mem(current))) { > mark_oom_victim(current); > - goto out; > + return true; > } > > /* > @@ -684,7 +683,7 @@ bool out_of_memory(struct oom_control *oc) > get_task_struct(current); > oom_kill_process(oc, current, 0, totalpages, NULL, > "Out of memory (oom_kill_allocating_task)"); > - goto out; > + return true; > } > > p = select_bad_process(oc, &points, totalpages); > @@ -696,16 +695,12 @@ bool out_of_memory(struct oom_control *oc) > if (p && p != (void *)-1UL) { > oom_kill_process(oc, p, points, totalpages, NULL, > "Out of memory"); > - killed = 1; > - } > -out: > - /* > - * Give the killed threads a good chance of exiting before trying to > - * allocate memory again. > - */ > - if (killed) > + /* > + * Give the killed process a good chance to exit before trying > + * to allocate memory again. > + */ > schedule_timeout_killable(1); > - > + } > return true; > } > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Michal Hocko SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
