Commit 7b1de586 authored by Wu Fengguang's avatar Wu Fengguang Committed by Linus Torvalds

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: default avatarDave Young <hidave.darkstar@gmail.com>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d3163ce
...@@ -219,6 +219,12 @@ static inline struct page *page_cache_alloc_cold(struct address_space *x) ...@@ -219,6 +219,12 @@ static inline struct page *page_cache_alloc_cold(struct address_space *x)
return __page_cache_alloc(mapping_gfp_mask(x)|__GFP_COLD); return __page_cache_alloc(mapping_gfp_mask(x)|__GFP_COLD);
} }
static inline struct page *page_cache_alloc_readahead(struct address_space *x)
{
return __page_cache_alloc(mapping_gfp_mask(x) |
__GFP_COLD | __GFP_NORETRY | __GFP_NOWARN);
}
typedef int filler_t(void *, struct page *); typedef int filler_t(void *, struct page *);
extern struct page * find_get_page(struct address_space *mapping, extern struct page * find_get_page(struct address_space *mapping,
......
...@@ -180,7 +180,7 @@ __do_page_cache_readahead(struct address_space *mapping, struct file *filp, ...@@ -180,7 +180,7 @@ __do_page_cache_readahead(struct address_space *mapping, struct file *filp,
if (page) if (page)
continue; continue;
page = page_cache_alloc_cold(mapping); page = page_cache_alloc_readahead(mapping);
if (!page) if (!page)
break; break;
page->index = page_offset; page->index = page_offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment