---

yaml --- r: 250912 b: refs/heads/master c: 7b1de58 h: refs/heads/master v: v3
git-mirror · May 25, 2011 · 54262b4 · 54262b4
1 parent 4520d5b
commit 54262b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3163ce86dd386b4f7bda80241d7fea2bc0bb1d
+refs/heads/master: 7b1de5868b124d8f399d8791ed30a9b679d64d4d
diff --git a/trunk/include/linux/pagemap.h b/trunk/include/linux/pagemap.h
@@ -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);
 }
 
+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 *);
 
 extern struct page * find_get_page(struct address_space *mapping,

diff --git a/trunk/mm/readahead.c b/trunk/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;