X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Ffilemap.c;h=c4ee2e918bea1c0aa140fde22d20164ba8eb357a;hb=4690dfa8cd66c37fbe99bb8cd5baa86102110776;hp=a0701e6eec107ae5247f41885e62a73efb4b4bdc;hpb=abce00f962a11ed6f748c2569e11695a30716b53;p=~andy%2Flinux

diff --git a/mm/filemap.c b/mm/filemap.c
index a0701e6eec1..c4ee2e918be 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2351,8 +2351,11 @@ 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:
@@ -2360,7 +2363,7 @@ repeat:
 	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,