aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-16 14:42:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-16 14:42:37 -0400
commit3d875182d7f4b27b7778c3ab6a39800d383968cb (patch)
tree588a0f89219f4252d93a102b49f661b1bf435a84 /fs/ext4
parent69984b64440729bf6b08d1ddc1b3ee8282a2c846 (diff)
parent934ed25ea505859cec5236dcb1769be5f998dd25 (diff)
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "6 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: sh: add copy_user_page() alias for __copy_user() lib/Kconfig: ZLIB_DEFLATE must select BITREVERSE mm, dax: fix DAX deadlocks memcg: convert threshold to bytes builddeb: remove debian/files before build mm, fs: obey gfp_mapping for add_to_page_cache()
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/readpage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index e26803fb210d..560af0437704 100644
--- a/fs/ext4/readpage.c
+++ b/fs/ext4/readpage.c
@@ -165,8 +165,8 @@ int ext4_mpage_readpages(struct address_space *mapping,
165 if (pages) { 165 if (pages) {
166 page = list_entry(pages->prev, struct page, lru); 166 page = list_entry(pages->prev, struct page, lru);
167 list_del(&page->lru); 167 list_del(&page->lru);
168 if (add_to_page_cache_lru(page, mapping, 168 if (add_to_page_cache_lru(page, mapping, page->index,
169 page->index, GFP_KERNEL)) 169 GFP_KERNEL & mapping_gfp_mask(mapping)))
170 goto next_page; 170 goto next_page;
171 } 171 }
172 172