summaryrefslogtreecommitdiff
path: root/mm/readahead.c
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2011-05-24 17:12:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 08:39:25 -0700
commit7b1de5868b124d8f399d8791ed30a9b679d64d4d (patch)
tree3a7d5d7a6ccc3226648cb0e56387614b7066c3ff /mm/readahead.c
parent6d3163ce86dd386b4f7bda80241d7fea2bc0bb1d (diff)
downloadlinux-3.10-7b1de5868b124d8f399d8791ed30a9b679d64d4d.tar.gz
linux-3.10-7b1de5868b124d8f399d8791ed30a9b679d64d4d.tar.bz2
linux-3.10-7b1de5868b124d8f399d8791ed30a9b679d64d4d.zip
readahead: readahead page allocations are OK to fail
Pass __GFP_NORETRY|__GFP_NOWARN for readahead page allocations. readahead page allocations are completely optional. They are OK to fail and in particular shall not trigger OOM on themselves. Reported-by: Dave Young <hidave.darkstar@gmail.com> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Reviewed-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/readahead.c')
-rw-r--r--mm/readahead.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/readahead.c b/mm/readahead.c
index 2c0cc489e28..867f9dd82dc 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -180,7 +180,7 @@ __do_page_cache_readahead(struct address_space *mapping, struct file *filp,
if (page)
continue;
- page = page_cache_alloc_cold(mapping);
+ page = page_cache_alloc_readahead(mapping);
if (!page)
break;
page->index = page_offset;