Merge tag 'for-6.10/block-20240511' of git://git.kernel.dk/linux

[thirdparty/kernel/linux.git] / block / fops.c

diff --git a/block/fops.c b/block/fops.c
index af6c244314afadb0674c1c354bf749de0f1ef74f..7a163f7fe2d8ccb4e130214805633422bb05dbe7 100644 (file)
--- a/block/fops.c
+++ b/block/fops.c
@@ -44,18 +44,15 @@ static bool blkdev_dio_unaligned(struct block_device *bdev, loff_t pos,
 #define DIO_INLINE_BIO_VECS 4
 
 static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb,
-               struct iov_iter *iter, unsigned int nr_pages)
+               struct iov_iter *iter, struct block_device *bdev,
+               unsigned int nr_pages)
 {
-       struct block_device *bdev = I_BDEV(iocb->ki_filp->f_mapping->host);
        struct bio_vec inline_vecs[DIO_INLINE_BIO_VECS], *vecs;
        loff_t pos = iocb->ki_pos;
        bool should_dirty = false;
        struct bio bio;
        ssize_t ret;
 
-       if (blkdev_dio_unaligned(bdev, pos, iter))
-               return -EINVAL;
-
        if (nr_pages <= DIO_INLINE_BIO_VECS)
                vecs = inline_vecs;
        else {
@@ -161,9 +158,8 @@ static void blkdev_bio_end_io(struct bio *bio)
 }
 
 static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
-               unsigned int nr_pages)
+               struct block_device *bdev, unsigned int nr_pages)
 {
-       struct block_device *bdev = I_BDEV(iocb->ki_filp->f_mapping->host);
        struct blk_plug plug;
        struct blkdev_dio *dio;
        struct bio *bio;
@@ -172,9 +168,6 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
        loff_t pos = iocb->ki_pos;
        int ret = 0;
 
-       if (blkdev_dio_unaligned(bdev, pos, iter))
-               return -EINVAL;
-
        if (iocb->ki_flags & IOCB_ALLOC_CACHE)
                opf |= REQ_ALLOC_CACHE;
        bio = bio_alloc_bioset(bdev, nr_pages, opf, GFP_KERNEL,
@@ -302,9 +295,9 @@ static void blkdev_bio_end_io_async(struct bio *bio)
 
 static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb,
                                        struct iov_iter *iter,
+                                       struct block_device *bdev,
                                        unsigned int nr_pages)
 {
-       struct block_device *bdev = I_BDEV(iocb->ki_filp->f_mapping->host);
        bool is_read = iov_iter_rw(iter) == READ;
        blk_opf_t opf = is_read ? REQ_OP_READ : dio_bio_write_op(iocb);
        struct blkdev_dio *dio;
@@ -312,9 +305,6 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb,
        loff_t pos = iocb->ki_pos;
        int ret = 0;
 
-       if (blkdev_dio_unaligned(bdev, pos, iter))
-               return -EINVAL;
-
        if (iocb->ki_flags & IOCB_ALLOC_CACHE)
                opf |= REQ_ALLOC_CACHE;
        bio = bio_alloc_bioset(bdev, nr_pages, opf, GFP_KERNEL,
@@ -368,18 +358,23 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb,
 
 static ssize_t blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 {
+       struct block_device *bdev = I_BDEV(iocb->ki_filp->f_mapping->host);
        unsigned int nr_pages;
 
        if (!iov_iter_count(iter))
                return 0;
 
+       if (blkdev_dio_unaligned(bdev, iocb->ki_pos, iter))
+               return -EINVAL;
+
        nr_pages = bio_iov_vecs_to_alloc(iter, BIO_MAX_VECS + 1);
        if (likely(nr_pages <= BIO_MAX_VECS)) {
                if (is_sync_kiocb(iocb))
-                       return __blkdev_direct_IO_simple(iocb, iter, nr_pages);
-               return __blkdev_direct_IO_async(iocb, iter, nr_pages);
+                       return __blkdev_direct_IO_simple(iocb, iter, bdev,
+                                                       nr_pages);
+               return __blkdev_direct_IO_async(iocb, iter, bdev, nr_pages);
        }
-       return __blkdev_direct_IO(iocb, iter, bio_max_segs(nr_pages));
+       return __blkdev_direct_IO(iocb, iter, bdev, bio_max_segs(nr_pages));
 }
 
 static int blkdev_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
@@ -390,7 +385,7 @@ static int blkdev_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
 
        iomap->bdev = bdev;
        iomap->offset = ALIGN_DOWN(offset, bdev_logical_block_size(bdev));
-       if (iomap->offset >= isize)
+       if (offset >= isize)
                return -EIO;
        iomap->type = IOMAP_MAPPED;
        iomap->addr = iomap->offset;