block: move bio_iov_iter_get_bdev_pages to block/fops.c

Keep bio_iov_iter_get_bdev_pages local with the callers, as blindly
looking at the bdev logical block size is often not the best idea
unless on a block device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/fops.c b/block/fops.c
index c2c0396ea9ee117a5809c001b8022103dbdacc6f..5e3db9fead77c88118031d734cf68401319d123b 100644 (file)
--- a/block/fops.c
+++ b/block/fops.c
@@ -43,6 +43,13 @@ static bool blkdev_dio_invalid(struct block_device *bdev, struct kiocb *iocb,
                        (bdev_logical_block_size(bdev) - 1);
 }
 
+static inline int blkdev_iov_iter_get_pages(struct bio *bio,
+               struct iov_iter *iter, struct block_device *bdev)
+{
+       return bio_iov_iter_get_pages(bio, iter,
+                       bdev_logical_block_size(bdev) - 1);
+}
+
 #define DIO_INLINE_BIO_VECS 4
 
 static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb,
@@ -78,7 +85,7 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb,
        if (iocb->ki_flags & IOCB_ATOMIC)
                bio.bi_opf |= REQ_ATOMIC;
 
-       ret = bio_iov_iter_get_bdev_pages(&bio, iter, bdev);
+       ret = blkdev_iov_iter_get_pages(&bio, iter, bdev);
        if (unlikely(ret))
                goto out;
        ret = bio.bi_iter.bi_size;
@@ -212,7 +219,7 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
                bio->bi_end_io = blkdev_bio_end_io;
                bio->bi_ioprio = iocb->ki_ioprio;
 
-               ret = bio_iov_iter_get_bdev_pages(bio, iter, bdev);
+               ret = blkdev_iov_iter_get_pages(bio, iter, bdev);
                if (unlikely(ret)) {
                        bio->bi_status = BLK_STS_IOERR;
                        bio_endio(bio);
@@ -348,7 +355,7 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb,
                 */
                bio_iov_bvec_set(bio, iter);
        } else {
-               ret = bio_iov_iter_get_bdev_pages(bio, iter, bdev);
+               ret = blkdev_iov_iter_get_pages(bio, iter, bdev);
                if (unlikely(ret))
                        goto out_bio_put;
        }

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index c97e8b0e67b671955f4543264514c2589f429d80..d4db5039836dbdd651cb82333cb7303d2734e942 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1873,13 +1873,6 @@ static inline int bio_split_rw_at(struct bio *bio,
        return bio_split_io_at(bio, lim, segs, max_bytes, lim->dma_alignment);
 }
 
-static inline int bio_iov_iter_get_bdev_pages(struct bio *bio,
-               struct iov_iter *iter, struct block_device *bdev)
-{
-       return bio_iov_iter_get_pages(bio, iter,
-                                       bdev_logical_block_size(bdev) - 1);
-}
-
 #define DEFINE_IO_COMP_BATCH(name)     struct io_comp_batch name = { }
 
 #endif /* _LINUX_BLKDEV_H */