Merge tag 'mtd/mtk-spi-nand-for-5.19' into nand/next

[linux-2.6-microblaze.git] / fs / mpage.c

diff --git a/fs/mpage.c b/fs/mpage.c
index 9ed1e58..1fe56f8 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -148,13 +148,11 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
        int op = REQ_OP_READ;
        unsigned nblocks;
        unsigned relative_block;
-       gfp_t gfp;
+       gfp_t gfp = mapping_gfp_constraint(page->mapping, GFP_KERNEL);
 
        if (args->is_readahead) {
                op |= REQ_RAHEAD;
-               gfp = readahead_gfp_mask(page->mapping);
-       } else {
-               gfp = mapping_gfp_constraint(page->mapping, GFP_KERNEL);
+               gfp |= __GFP_NORETRY | __GFP_NOWARN;
        }
 
        if (page_has_buffers(page))
@@ -588,7 +586,6 @@ alloc_new:
                                GFP_NOFS);
                bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9);
                wbc_init_bio(wbc, bio);
-               bio->bi_write_hint = inode->i_write_hint;
        }
 
        /*