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

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

diff --git a/fs/remap_range.c b/fs/remap_range.c
index f1a3795..046a513 100644 (file)
--- a/fs/remap_range.c
+++ b/fs/remap_range.c
@@ -71,7 +71,8 @@ static int generic_remap_checks(struct file *file_in, loff_t pos_in,
         * Otherwise, make sure the count is also block-aligned, having
         * already confirmed the starting offsets' block alignment.
         */
-       if (pos_in + count == size_in) {
+       if (pos_in + count == size_in &&
+           (!(remap_flags & REMAP_FILE_DEDUP) || pos_out + count == size_out)) {
                bcount = ALIGN(size_in, bs) - pos_in;
        } else {
                if (!IS_ALIGNED(count, bs))