1 files changed, 25 insertions, 8 deletions

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index da1a447bef51..f135748d8282 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -1241,6 +1241,26 @@ xfs_reflink_remap_unlock(
 }
 
 /*
+ * If we're reflinking to a point past the destination file's EOF, we must
+ * zero any speculative post-EOF preallocations that sit between the old EOF
+ * and the destination file offset.
+ */
+static int
+xfs_reflink_zero_posteof(
+        struct xfs_inode        *ip,
+        loff_t                  pos)
+{
+        loff_t                  isize = i_size_read(VFS_I(ip));
+
+        if (pos <= isize)
+                return 0;
+
+        trace_xfs_zero_eof(ip, isize, pos - isize);
+        return iomap_zero_range(VFS_I(ip), isize, pos - isize, NULL,
+                        &xfs_iomap_ops);
+}
+
+/*
  * Prepare two files for range cloning.  Upon a successful return both inodes
  * will have the iolock and mmaplock held, the page cache of the out file
  * will be truncated, and any leases on the out file will have been broken.
@@ -1292,15 +1312,12 @@ xfs_reflink_remap_prep(
                 goto out_unlock;
 
         /*
-         * Clear out post-eof preallocations because we don't have page cache
-         * backing the delayed allocations and they'll never get freed on
-         * their own.
+         * Zero existing post-eof speculative preallocations in the destination
+         * file.
          */
-        if (xfs_can_free_eofblocks(dest, true)) {
-                ret = xfs_free_eofblocks(dest);
-                if (ret)
-                        goto out_unlock;
-        }
+        ret = xfs_reflink_zero_posteof(dest, pos_out);
+        if (ret)
+                goto out_unlock;
 
         /* Set flags and remap blocks. */
         ret = xfs_reflink_set_inode_flag(src, dest);