summaryrefslogtreecommitdiffstats
path: root/mm/filemap.c
diff options
context:
space:
mode:
authorJohannes Weiner2015-06-25 01:57:21 +0200
committerLinus Torvalds2015-06-25 02:49:43 +0200
commit9083905a2a13dec4093a9c35a9b7f60037b87672 (patch)
tree8f1400ca04d102e6b489053b2595247e24aa7094 /mm/filemap.c
parentmm: oom_kill: simplify OOM killer locking (diff)
downloadkernel-qcow2-linux-9083905a2a13dec4093a9c35a9b7f60037b87672.tar.gz
kernel-qcow2-linux-9083905a2a13dec4093a9c35a9b7f60037b87672.tar.xz
kernel-qcow2-linux-9083905a2a13dec4093a9c35a9b7f60037b87672.zip
mm: page_alloc: inline should_alloc_retry()
The should_alloc_retry() function was meant to encapsulate retry conditions of the allocator slowpath, but there are still checks remaining in the main function, and much of how the retrying is performed also depends on the OOM killer progress. The physical separation of those conditions make the code hard to follow. Inline the should_alloc_retry() checks. Notes: - The __GFP_NOFAIL check is already done in __alloc_pages_may_oom(), replace it with looping on OOM killer progress - The pm_suspended_storage() check is meant to skip the OOM killer when reclaim has no IO available, move to __alloc_pages_may_oom() - The order <= PAGE_ALLOC_COSTLY order is re-united with its original counterpart of checking whether reclaim actually made any progress Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Cc: David Rientjes <rientjes@google.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Dave Chinner <david@fromorbit.com> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/filemap.c')
0 files changed, 0 insertions, 0 deletions