On Thu, Feb 27, 2025 at 06:08:02PM +0000, John Garry wrote:
> In future we will want more boolean options for xfs_reflink_allocate_cow(),
> so just prepare for this by passing a flags arg for @convert_now.
>
> Suggested-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> Signed-off-by: John Garry <john.g.garry@xxxxxxxxxx>
Looks decent,
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_iomap.c | 7 +++++--
> fs/xfs/xfs_reflink.c | 10 ++++++----
> fs/xfs/xfs_reflink.h | 7 ++++++-
> 3 files changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index d61460309a78..edfc038bf728 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -810,6 +810,7 @@ xfs_direct_write_iomap_begin(
> xfs_fileoff_t offset_fsb = XFS_B_TO_FSBT(mp, offset);
> xfs_fileoff_t end_fsb = xfs_iomap_end_fsb(mp, offset, length);
> int nimaps = 1, error = 0;
> + unsigned int reflink_flags = 0;
> bool shared = false;
> u16 iomap_flags = 0;
> unsigned int lockmode;
> @@ -820,6 +821,9 @@ xfs_direct_write_iomap_begin(
> if (xfs_is_shutdown(mp))
> return -EIO;
>
> + if (flags & IOMAP_DIRECT || IS_DAX(inode))
> + reflink_flags |= XFS_REFLINK_CONVERT;
> +
> /*
> * Writes that span EOF might trigger an IO size update on completion,
> * so consider them to be dirty for the purposes of O_DSYNC even if
> @@ -864,8 +868,7 @@ xfs_direct_write_iomap_begin(
>
> /* may drop and re-acquire the ilock */
> error = xfs_reflink_allocate_cow(ip, &imap, &cmap, &shared,
> - &lockmode,
> - (flags & IOMAP_DIRECT) || IS_DAX(inode));
> + &lockmode, reflink_flags);
> if (error)
> goto out_unlock;
> if (shared)
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 59f7fc16eb80..0eb2670fc6fb 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -435,7 +435,7 @@ xfs_reflink_fill_cow_hole(
> struct xfs_bmbt_irec *cmap,
> bool *shared,
> uint *lockmode,
> - bool convert_now)
> + unsigned int flags)
> {
> struct xfs_mount *mp = ip->i_mount;
> struct xfs_trans *tp;
> @@ -488,7 +488,8 @@ xfs_reflink_fill_cow_hole(
> return error;
>
> convert:
> - return xfs_reflink_convert_unwritten(ip, imap, cmap, convert_now);
> + return xfs_reflink_convert_unwritten(ip, imap, cmap,
> + flags & XFS_REFLINK_CONVERT);
>
> out_trans_cancel:
> xfs_trans_cancel(tp);
> @@ -566,10 +567,11 @@ xfs_reflink_allocate_cow(
> struct xfs_bmbt_irec *cmap,
> bool *shared,
> uint *lockmode,
> - bool convert_now)
> + unsigned int flags)
> {
> int error;
> bool found;
> + bool convert_now = flags & XFS_REFLINK_CONVERT;
>
> xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
> if (!ip->i_cowfp) {
> @@ -592,7 +594,7 @@ xfs_reflink_allocate_cow(
> */
> if (cmap->br_startoff > imap->br_startoff)
> return xfs_reflink_fill_cow_hole(ip, imap, cmap, shared,
> - lockmode, convert_now);
> + lockmode, flags);
>
> /*
> * CoW fork has a delalloc reservation. Replace it with a real extent.
> diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
> index cc4e92278279..cdbd73d58822 100644
> --- a/fs/xfs/xfs_reflink.h
> +++ b/fs/xfs/xfs_reflink.h
> @@ -6,6 +6,11 @@
> #ifndef __XFS_REFLINK_H
> #define __XFS_REFLINK_H 1
>
> +/*
> + * Flags for xfs_reflink_allocate_cow()
> + */
> +#define XFS_REFLINK_CONVERT (1u << 0) /* convert unwritten extents now */
> +
> /*
> * Check whether it is safe to free COW fork blocks from an inode. It is unsafe
> * to do so when an inode has dirty cache or I/O in-flight, even if no shared
> @@ -32,7 +37,7 @@ int xfs_bmap_trim_cow(struct xfs_inode *ip, struct xfs_bmbt_irec *imap,
>
> int xfs_reflink_allocate_cow(struct xfs_inode *ip, struct xfs_bmbt_irec *imap,
> struct xfs_bmbt_irec *cmap, bool *shared, uint *lockmode,
> - bool convert_now);
> + unsigned int flags);
> extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset,
> xfs_off_t count);
>
> --
> 2.31.1
>
