Re: [PATCH 5/6] xfs: move the xfs_is_always_cow_inode check into xfs_alloc_file_space

Darrick J. Wong
2024-08-27T16:03:54Z

On Tue, Aug 27, 2024 at 08:50:49AM +0200, Christoph Hellwig wrote:
> Move the xfs_is_always_cow_inode check from the caller into
> xfs_alloc_file_space to prepare for refactoring of xfs_file_fallocate.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
> fs/xfs/xfs_bmap_util.c | 3 +++
> fs/xfs/xfs_file.c | 8 +++-----
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 187a0dbda24fc4..e9fdebaa40ea59 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -653,6 +653,9 @@ xfs_alloc_file_space(
> xfs_bmbt_irec_t imaps[1], *imapp;
> int error;
>
> + if (xfs_is_always_cow_inode(ip))
> + return 0;
> +
> trace_xfs_alloc_file_space(ip);
>
> if (xfs_is_shutdown(mp))
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 5b9e49da06013c..489bc1b173c268 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -987,11 +987,9 @@ xfs_file_fallocate(
> }
> }
>
> - if (!xfs_is_always_cow_inode(ip)) {
> - error = xfs_alloc_file_space(ip, offset, len);
> - if (error)
> - goto out_unlock;
> - }
> + error = xfs_alloc_file_space(ip, offset, len);
> + if (error)
> + goto out_unlock;
> }
>
> /* Change file size if needed */
> --
> 2.43.0
>
>