Merge remote-tracking branch 'ext4/dev'

diff --combined fs/ext4/readpage.c
index 560af043770462df6170acd4d523f9d0385884a3,a91e4bf6ebc454802812907d261674c9254b6afe..d94af71a4e7fcabd1783f28cccb86363473fe3ae
--- 1/fs/ext4/readpage.c
--- 2/fs/ext4/readpage.c
+++ b/fs/ext4/readpage.c
@@@ -62,7 -62,7 +62,7 @@@ static void completion_pages(struct wor
        bio_for_each_segment_all(bv, bio, i) {
                struct page *page = bv->bv_page;
  
-               int ret = ext4_decrypt(ctx, page);
+               int ret = ext4_decrypt(page);
                if (ret) {
                        WARN_ON_ONCE(1);
                        SetPageError(page);
@@@ -165,8 -165,8 +165,8 @@@ int ext4_mpage_readpages(struct address
                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;
                }