]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
xfs: reflink should force the log out if mounted with wsync
authorChristoph Hellwig <hch@lst.de>
Fri, 3 Apr 2020 18:45:37 +0000 (11:45 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Mon, 6 Apr 2020 15:44:39 +0000 (08:44 -0700)
Reflink should force the log out to disk if the filesystem was mounted
with wsync, the same as most other operations in xfs.

[Note: XFS_MOUNT_WSYNC is set when the admin mounts the filesystem
with either the 'wsync' or 'sync' mount options, which effectively means
that we're classifying reflink/dedupe as IO operations and making them
synchronous when required.]

Fixes: 3fc9f5e409319 ("xfs: remove xfs_reflink_remap_range")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
[darrick: add more to the changelog]
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
fs/xfs/xfs_file.c

index 68e1cbb3cfcc826fc97fbfd7dd8159110222d926..4b8bdecc38635751e8476b1ed49db2950ebb8d19 100644 (file)
@@ -1059,7 +1059,11 @@ xfs_file_remap_range(
 
        ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize,
                        remap_flags);
+       if (ret)
+               goto out_unlock;
 
+       if (mp->m_flags & XFS_MOUNT_WSYNC)
+               xfs_log_force_inode(dest);
 out_unlock:
        xfs_reflink_remap_unlock(file_in, file_out);
        if (ret)