Merge tag 'mm-nonmm-stable-2023-02-20-15-29' of git://git.kernel.org/pub/scm/linux...

[linux-block.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 2693f34afb7e9e596bc94c1fc60552131fe93e42..2e421c0dad13a0fd972d53156f4ef742fe759f9e 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -1236,11 +1236,11 @@ static int bio_iov_add_zone_append_page(struct bio *bio, struct page *page,
  */
 static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 {
+       iov_iter_extraction_t extraction_flags = 0;
        unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt;
        unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;
        struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;
        struct page **pages = (struct page **)bv;
-       unsigned int gup_flags = 0;
        ssize_t size, left;
        unsigned len, i = 0;
        size_t offset, trim;
@@ -1255,7 +1255,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
        pages += entries_left * (PAGE_PTRS_PER_BVEC - 1);
 
        if (bio->bi_bdev && blk_queue_pci_p2pdma(bio->bi_bdev->bd_disk->queue))
-               gup_flags |= FOLL_PCI_P2PDMA;
+               extraction_flags |= ITER_ALLOW_P2PDMA;
 
        /*
         * Each segment in the iov is required to be a block size multiple.
@@ -1266,7 +1266,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
         */
        size = iov_iter_get_pages(iter, pages,
                                  UINT_MAX - bio->bi_iter.bi_size,
-                                 nr_pages, &offset, gup_flags);
+                                 nr_pages, &offset, extraction_flags);
        if (unlikely(size <= 0))
                return size ? size : -EFAULT;