Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / fs / ext4 / readpage.c

diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index bfc7f4d30643256836d813552097946adb58e2a2..a81b829d56def34de7e6b1f7402784cb21011742 100644 (file)
--- a/fs/ext4/readpage.c
+++ b/fs/ext4/readpage.c
@@ -130,7 +130,7 @@ int ext4_mpage_readpages(struct address_space *mapping,
                        page = list_entry(pages->prev, struct page, lru);
                        list_del(&page->lru);
                        if (add_to_page_cache_lru(page, mapping, page->index,
-                                 mapping_gfp_constraint(mapping, GFP_KERNEL)))
+                                 readahead_gfp_mask(mapping)))
                                goto next_page;
                }