Re: [PATCH 1/2] xfs: mark __xfs_rtgroup_extents static

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

On Fri, Jan 09, 2026 at 04:18:53PM +0100, Christoph Hellwig wrote:
> __xfs_rtgroup_extents is not used outside of xfs_rtgroup.c, so mark it
> static.  Move it and xfs_rtgroup_extents up in the file to avoid forward
> declarations.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks good to me,
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/libxfs/xfs_rtgroup.c | 50 ++++++++++++++++++-------------------
>  fs/xfs/libxfs/xfs_rtgroup.h |  2 --
>  2 files changed, 25 insertions(+), 27 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_rtgroup.c b/fs/xfs/libxfs/xfs_rtgroup.c
> index 9186c58e83d5..5a3d0dc6ae1b 100644
> --- a/fs/xfs/libxfs/xfs_rtgroup.c
> +++ b/fs/xfs/libxfs/xfs_rtgroup.c
> @@ -48,6 +48,31 @@ xfs_rtgroup_min_block(
>  	return 0;
>  }
>  
> +/* Compute the number of rt extents in this realtime group. */
> +static xfs_rtxnum_t
> +__xfs_rtgroup_extents(
> +	struct xfs_mount	*mp,
> +	xfs_rgnumber_t		rgno,
> +	xfs_rgnumber_t		rgcount,
> +	xfs_rtbxlen_t		rextents)
> +{
> +	ASSERT(rgno < rgcount);
> +	if (rgno == rgcount - 1)
> +		return rextents - ((xfs_rtxnum_t)rgno * mp->m_sb.sb_rgextents);
> +
> +	ASSERT(xfs_has_rtgroups(mp));
> +	return mp->m_sb.sb_rgextents;
> +}
> +
> +xfs_rtxnum_t
> +xfs_rtgroup_extents(
> +	struct xfs_mount	*mp,
> +	xfs_rgnumber_t		rgno)
> +{
> +	return __xfs_rtgroup_extents(mp, rgno, mp->m_sb.sb_rgcount,
> +			mp->m_sb.sb_rextents);
> +}
> +
>  /* Precompute this group's geometry */
>  void
>  xfs_rtgroup_calc_geometry(
> @@ -136,31 +161,6 @@ xfs_initialize_rtgroups(
>  	return error;
>  }
>  
> -/* Compute the number of rt extents in this realtime group. */
> -xfs_rtxnum_t
> -__xfs_rtgroup_extents(
> -	struct xfs_mount	*mp,
> -	xfs_rgnumber_t		rgno,
> -	xfs_rgnumber_t		rgcount,
> -	xfs_rtbxlen_t		rextents)
> -{
> -	ASSERT(rgno < rgcount);
> -	if (rgno == rgcount - 1)
> -		return rextents - ((xfs_rtxnum_t)rgno * mp->m_sb.sb_rgextents);
> -
> -	ASSERT(xfs_has_rtgroups(mp));
> -	return mp->m_sb.sb_rgextents;
> -}
> -
> -xfs_rtxnum_t
> -xfs_rtgroup_extents(
> -	struct xfs_mount	*mp,
> -	xfs_rgnumber_t		rgno)
> -{
> -	return __xfs_rtgroup_extents(mp, rgno, mp->m_sb.sb_rgcount,
> -			mp->m_sb.sb_rextents);
> -}
> -
>  /*
>   * Update the rt extent count of the previous tail rtgroup if it changed during
>   * recovery (i.e. recovery of a growfs).
> diff --git a/fs/xfs/libxfs/xfs_rtgroup.h b/fs/xfs/libxfs/xfs_rtgroup.h
> index 03f1e2493334..73cace4d25c7 100644
> --- a/fs/xfs/libxfs/xfs_rtgroup.h
> +++ b/fs/xfs/libxfs/xfs_rtgroup.h
> @@ -285,8 +285,6 @@ void xfs_free_rtgroups(struct xfs_mount *mp, xfs_rgnumber_t first_rgno,
>  int xfs_initialize_rtgroups(struct xfs_mount *mp, xfs_rgnumber_t first_rgno,
>  		xfs_rgnumber_t end_rgno, xfs_rtbxlen_t rextents);
>  
> -xfs_rtxnum_t __xfs_rtgroup_extents(struct xfs_mount *mp, xfs_rgnumber_t rgno,
> -		xfs_rgnumber_t rgcount, xfs_rtbxlen_t rextents);
>  xfs_rtxnum_t xfs_rtgroup_extents(struct xfs_mount *mp, xfs_rgnumber_t rgno);
>  void xfs_rtgroup_calc_geometry(struct xfs_mount *mp, struct xfs_rtgroup *rtg,
>  		xfs_rgnumber_t rgno, xfs_rgnumber_t rgcount,
> -- 
> 2.47.3
> 
>