Re: [PATCH 05/10] xfs: reinstate RT support in xfs_bmapi_reserve_delalloc

["Darrick J. Wong" <djwong@kernel.org>]

On Fri, Feb 23, 2024 at 08:15:01AM +0100, Christoph Hellwig wrote:
> Allocate data blocks for RT inodes using xfs_dec_frextents.  While at
> it optimize the data device case by doing only a single xfs_dec_fdblocks
> call for the extent itself and the indirect blocks.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

I like collapsing the two xfs_dec_fdblocks calls into one.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
>  fs/xfs/libxfs/xfs_bmap.c | 22 ++++++++++++++--------
>  1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index cc788cde8bffd6..95e93534cd1264 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3984,6 +3984,7 @@ xfs_bmapi_reserve_delalloc(
>  	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);
>  	xfs_extlen_t		alen;
>  	xfs_extlen_t		indlen;
> +	uint64_t		fdblocks;
>  	int			error;
>  	xfs_fileoff_t		aoff = off;
>  
> @@ -4026,14 +4027,18 @@ xfs_bmapi_reserve_delalloc(
>  	indlen = (xfs_extlen_t)xfs_bmap_worst_indlen(ip, alen);
>  	ASSERT(indlen > 0);
>  
> -	error = xfs_dec_fdblocks(mp, alen, false);
> -	if (error)
> -		goto out_unreserve_quota;
> +	fdblocks = indlen;
> +	if (XFS_IS_REALTIME_INODE(ip)) {
> +		error = xfs_dec_frextents(mp, xfs_rtb_to_rtx(mp, alen));
> +		if (error)
> +			goto out_unreserve_quota;
> +	} else {
> +		fdblocks += alen;
> +	}
>  
> -	error = xfs_dec_fdblocks(mp, indlen, false);
> +	error = xfs_dec_fdblocks(mp, fdblocks, false);
>  	if (error)
> -		goto out_unreserve_blocks;
> -
> +		goto out_unreserve_frextents;
>  
>  	ip->i_delayed_blks += alen;
>  	xfs_mod_delalloc(ip->i_mount, alen + indlen);
> @@ -4057,8 +4062,9 @@ xfs_bmapi_reserve_delalloc(
>  
>  	return 0;
>  
> -out_unreserve_blocks:
> -	xfs_add_fdblocks(mp, alen);
> +out_unreserve_frextents:
> +	if (XFS_IS_REALTIME_INODE(ip))
> +		xfs_add_frextents(mp, xfs_rtb_to_rtx(mp, alen));
>  out_unreserve_quota:
>  	if (XFS_IS_QUOTA_ON(mp))
>  		xfs_quota_unreserve_blkres(ip, alen);
> -- 
> 2.39.2
> 
>