From 126d0032131dd94c78c5c12ce0d62b2e7ef47876 Mon Sep 17 00:00:00 2001 From: Ameer Hamza Date: Sat, 10 Aug 2024 01:27:11 +0500 Subject: [PATCH] Address Mav's review feedback Signed-off-by: Ameer Hamza --- block/blk-lib.c | 7 ++++++- block/fops.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 66ee0a09bd65..26db9830b79e 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -227,10 +227,15 @@ ssize_t blkdev_copy_offload(struct block_device *bdev, loff_t pos_in, ssize_t ret; struct blk_plug plug; - if (!max_copy_bytes || bdev->bd_queue->mq_ops == NULL) + if (!max_copy_bytes || bdev->bd_queue->mq_ops == NULL || + bdev->bd_queue->mq_ops != bdev_out->bd_queue->mq_ops) return -EOPNOTSUPP; ret = blkdev_copy_sanity_check(bdev, pos_in, bdev, pos_out, len); + + if (ret == 0) + ret = blkdev_copy_sanity_check(bdev_out, pos_in, bdev, pos_out, len); + if (ret) return ret; diff --git a/block/fops.c b/block/fops.c index f60f136093f7..145f67dd3e99 100644 --- a/block/fops.c +++ b/block/fops.c @@ -779,12 +779,12 @@ static ssize_t blkdev_copy_file_range(struct file *file_in, loff_t pos_in, struct block_device *out_bdev = I_BDEV(bdev_file_inode(file_out)); ssize_t copied = 0; - if (/*(in_bdev == out_bdev) &&*/ bdev_max_copy_sectors(in_bdev) && + if (bdev_max_copy_sectors(in_bdev) && (file_in->f_iocb_flags & IOCB_DIRECT) && (file_out->f_iocb_flags & IOCB_DIRECT)) { copied = blkdev_copy_offload(in_bdev, pos_in, pos_out, len, NULL, NULL, GFP_KERNEL, out_bdev); - if (copied < 0) + if (copied != -EOPNOTSUPP && copied < 0) copied = 0; } else { copied = splice_copy_file_range(file_in, pos_in + copied,