Re: [PATCH 10/19] xfs: move xfs_rtget_summary to xfs_rtbitmap.c

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

On Thu, Dec 14, 2023 at 07:34:29AM +0100, Christoph Hellwig wrote:
> xfs_rtmodify_summary_int is only used inside xfs_rtbitmap.c and to
> implement xfs_rtget_summary.  Move xfs_rtget_summary to xfs_rtbitmap.c
> as the exported API and mark xfs_rtmodify_summary_int static.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

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

--D

> ---
>  fs/xfs/libxfs/xfs_rtbitmap.c | 14 ++++++++++++++
>  fs/xfs/libxfs/xfs_rtbitmap.h |  4 ++--
>  fs/xfs/xfs_rtalloc.c         | 16 ----------------
>  3 files changed, 16 insertions(+), 18 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
> index 30a2844f62e30f..e67f6f763f7d0f 100644
> --- a/fs/xfs/libxfs/xfs_rtbitmap.c
> +++ b/fs/xfs/libxfs/xfs_rtbitmap.c
> @@ -519,6 +519,20 @@ xfs_rtmodify_summary(
>  	return xfs_rtmodify_summary_int(args, log, bbno, delta, NULL);
>  }
>  
> +/*
> + * Read and return the summary information for a given extent size, bitmap block
> + * combination.
> + */
> +int
> +xfs_rtget_summary(
> +	struct xfs_rtalloc_args	*args,
> +	int			log,	/* log2 of extent size */
> +	xfs_fileoff_t		bbno,	/* bitmap block number */
> +	xfs_suminfo_t		*sum)	/* out: summary info for this block */
> +{
> +	return xfs_rtmodify_summary_int(args, log, bbno, 0, sum);
> +}
> +
>  /* Log rtbitmap block from the word @from to the byte before @next. */
>  static inline void
>  xfs_trans_log_rtbitmap(
> diff --git a/fs/xfs/libxfs/xfs_rtbitmap.h b/fs/xfs/libxfs/xfs_rtbitmap.h
> index 1c84b52de3d424..274dc7dae1faf8 100644
> --- a/fs/xfs/libxfs/xfs_rtbitmap.h
> +++ b/fs/xfs/libxfs/xfs_rtbitmap.h
> @@ -321,8 +321,8 @@ int xfs_rtfind_forw(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
>  		xfs_rtxnum_t limit, xfs_rtxnum_t *rtblock);
>  int xfs_rtmodify_range(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
>  		xfs_rtxlen_t len, int val);
> -int xfs_rtmodify_summary_int(struct xfs_rtalloc_args *args, int log,
> -		xfs_fileoff_t bbno, int delta, xfs_suminfo_t *sum);
> +int xfs_rtget_summary(struct xfs_rtalloc_args *args, int log,
> +		xfs_fileoff_t bbno, xfs_suminfo_t *sum);
>  int xfs_rtmodify_summary(struct xfs_rtalloc_args *args, int log,
>  		xfs_fileoff_t bbno, int delta);
>  int xfs_rtfree_range(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
> diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
> index 2ce3bcf4b84b76..fbc60658ef24bf 100644
> --- a/fs/xfs/xfs_rtalloc.c
> +++ b/fs/xfs/xfs_rtalloc.c
> @@ -23,22 +23,6 @@
>  #include "xfs_rtbitmap.h"
>  #include "xfs_quota.h"
>  
> -/*
> - * Read and return the summary information for a given extent size,
> - * bitmap block combination.
> - * Keeps track of a current summary block, so we don't keep reading
> - * it from the buffer cache.
> - */
> -static int
> -xfs_rtget_summary(
> -	struct xfs_rtalloc_args	*args,
> -	int			log,	/* log2 of extent size */
> -	xfs_fileoff_t		bbno,	/* bitmap block number */
> -	xfs_suminfo_t		*sum)	/* out: summary info for this block */
> -{
> -	return xfs_rtmodify_summary_int(args, log, bbno, 0, sum);
> -}
> -
>  /*
>   * Return whether there are any free extents in the size range given
>   * by low and high, for the bitmap block bbno.
> -- 
> 2.39.2
> 
>