diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 11:42:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 11:42:37 -0700 |
| commit | 3d875182d7f4b27b7778c3ab6a39800d383968cb (patch) | |
| tree | 588a0f89219f4252d93a102b49f661b1bf435a84 /fs/ext4 | |
| parent | 69984b64440729bf6b08d1ddc1b3ee8282a2c846 (diff) | |
| parent | 934ed25ea505859cec5236dcb1769be5f998dd25 (diff) | |
| download | talos-obmc-linux-3d875182d7f4b27b7778c3ab6a39800d383968cb.tar.gz talos-obmc-linux-3d875182d7f4b27b7778c3ab6a39800d383968cb.zip | |
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.c | 4 |
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, if (pages) { page = list_entry(pages->prev, struct page, lru); list_del(&page->lru); - if (add_to_page_cache_lru(page, mapping, - page->index, GFP_KERNEL)) + if (add_to_page_cache_lru(page, mapping, page->index, + GFP_KERNEL & mapping_gfp_mask(mapping))) goto next_page; } |
