Re: [PATCH 2/2] xfs: fix the zoned RT growfs check for zone alignment

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

On Mon, Dec 15, 2025 at 10:48:37AM +0100, Christoph Hellwig wrote:
> The grofs code for zoned RT subvolums already tries to check for zone
> alignment, but gets it wrong by using the old instead of the new mount
> structure.

Please add
Cc: <stable@vger.kernel.org> # v6.15

> Fixes: 01b71e64bb87 ("xfs: support growfs on zoned file systems")
> Signed-off-by: Christoph Hellwig <hch@lst.de>

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

--D

> ---
>  fs/xfs/xfs_rtalloc.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
> index 6907e871fa15..e063f4f2f2e6 100644
> --- a/fs/xfs/xfs_rtalloc.c
> +++ b/fs/xfs/xfs_rtalloc.c
> @@ -1255,12 +1255,10 @@ xfs_growfs_check_rtgeom(
>  	min_logfsbs = min_t(xfs_extlen_t, xfs_log_calc_minimum_size(nmp),
>  			nmp->m_rsumblocks * 2);
>  
> -	kfree(nmp);
> -
>  	trace_xfs_growfs_check_rtgeom(mp, min_logfsbs);
>  
>  	if (min_logfsbs > mp->m_sb.sb_logblocks)
> -		return -EINVAL;
> +		goto out_inval;
>  
>  	if (xfs_has_zoned(mp)) {
>  		uint32_t	gblocks = mp->m_groups[XG_TYPE_RTG].blocks;
> @@ -1268,16 +1266,20 @@ xfs_growfs_check_rtgeom(
>  
>  		if (rextsize != 1)
>  			return -EINVAL;
> -		div_u64_rem(mp->m_sb.sb_rblocks, gblocks, &rem);
> +		div_u64_rem(nmp->m_sb.sb_rblocks, gblocks, &rem);
>  		if (rem) {
>  			xfs_warn(mp,
>  "new RT volume size (%lld) not aligned to RT group size (%d)",
> -				mp->m_sb.sb_rblocks, gblocks);
> -			return -EINVAL;
> +				nmp->m_sb.sb_rblocks, gblocks);
> +			goto out_inval;
>  		}
>  	}
>  
> +	kfree(nmp);
>  	return 0;
> +out_inval:
> +	kfree(nmp);
> +	return -EINVAL;
>  }
>  
>  /*
> -- 
> 2.47.3
> 
>