---

yaml --- r: 283012 b: refs/heads/master c: 0faa70c h: refs/heads/master v: v3
git-mirror · Jan 11, 2012 · bee90f8 · bee90f8
1 parent 323feb7
commit bee90f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a756cf5908530e8b40bdf569eb48b40139e8d7fd
+refs/heads/master: 0faa70cb0180d45a06208e54b552a538aabb8a30
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
@@ -2351,16 +2351,19 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping,
 					pgoff_t index, unsigned flags)
 {
 	int status;
+	gfp_t gfp_mask;
 	struct page *page;
 	gfp_t gfp_notmask = 0;
+
+	gfp_mask = mapping_gfp_mask(mapping) | __GFP_WRITE;
 	if (flags & AOP_FLAG_NOFS)
 		gfp_notmask = __GFP_FS;
 repeat:
 	page = find_lock_page(mapping, index);
 	if (page)
 		goto found;
 
-	page = __page_cache_alloc(mapping_gfp_mask(mapping) & ~gfp_notmask);
+	page = __page_cache_alloc(gfp_mask & ~gfp_notmask);
 	if (!page)
 		return NULL;
 	status = add_to_page_cache_lru(page, mapping, index,