Merge tag 'folio-6.0' of git://git.infradead.org/users/willy/pagecache

[platform/kernel/linux-starfive.git] / fs / mpage.c

diff --git a/fs/mpage.c b/fs/mpage.c
index 8326ff8..0f8ae95 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -147,7 +147,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
        struct block_device *bdev = NULL;
        int length;
        int fully_mapped = 1;
-       int op = REQ_OP_READ;
+       blk_opf_t opf = REQ_OP_READ;
        unsigned nblocks;
        unsigned relative_block;
        gfp_t gfp = mapping_gfp_constraint(folio->mapping, GFP_KERNEL);
@@ -156,7 +156,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
        VM_BUG_ON_FOLIO(folio_test_large(folio), folio);
 
        if (args->is_readahead) {
-               op |= REQ_RAHEAD;
+               opf |= REQ_RAHEAD;
                gfp |= __GFP_NORETRY | __GFP_NOWARN;
        }
 
@@ -274,7 +274,7 @@ alloc_new:
                                                                &folio->page))
                                goto out;
                }
-               args->bio = bio_alloc(bdev, bio_max_segs(args->nr_pages), op,
+               args->bio = bio_alloc(bdev, bio_max_segs(args->nr_pages), opf,
                                      gfp);
                if (args->bio == NULL)
                        goto confused;