Re: [RFC PATCH v2 5/5] xfsprogs: mkfs.xfs clean up unused dft option in various validators

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

On Mon, May 25, 2026 at 09:57:52AM +0200, Lukas Herbolt wrote:
> The struct cli_params dft was only used in validate_blocksize().
> Now the cli.blocksize is always set either over bld_dflt or
> file_dflt or from command line/config file. All the other functions
> are not accessing the dft in their body.
> 
> Signed-off-by: Lukas Herbolt <lukas@herbolt.com>

I wish this had come first, but oh well whatever.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  mkfs/xfs_mkfs.c | 24 +++++++++++-------------
>  1 file changed, 11 insertions(+), 13 deletions(-)
> 
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index cb9c528021d6..5d1d27235a72 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -2392,7 +2392,6 @@ static void
>  validate_sectorsize(
>  	struct mkfs_params	*cfg,
>  	struct cli_params	*cli,
> -	struct cli_params	*dft,
>  	struct fs_topology	*ft,
>  	int			dry_run,
>  	int			force_overwrite)
> @@ -2481,18 +2480,19 @@ _("block size %d cannot be smaller than sector size %d\n"),
>  static void
>  validate_blocksize(
>  	struct mkfs_params	*cfg,
> -	struct cli_params	*cli,
> -	struct cli_params	*dft)
> +	struct cli_params	*cli)
>  {
>  	/*
>  	 * Blocksize and sectorsize first, other things depend on them
>  	 * For RAID4/5/6 we want to align sector size and block size,
>  	 * so we need to start with the device geometry extraction too.
> +	 *
> +	 * The cli->blocksize size is already set from the bld_dflt
> +	 * or from file_dflt or via command line. We just need to check
> +	 * if the value is within our limits.
>  	 */
> -	if (!cli->blocksize)
> -		cfg->blocksize = dft->blocksize;
> -	else
> -		cfg->blocksize = cli->blocksize;
> +
> +	cfg->blocksize = cli->blocksize;
>  	cfg->blocklog = libxfs_highbit32(cfg->blocksize);
>  
>  	/* validate block sizes are in range */
> @@ -2522,7 +2522,6 @@ static void
>  validate_log_sectorsize(
>  	struct mkfs_params	*cfg,
>  	struct cli_params	*cli,
> -	struct cli_params	*dft,
>  	struct fs_topology	*ft)
>  {
>  
> @@ -2714,7 +2713,6 @@ static void
>  validate_zoned(
>  	struct mkfs_params	*cfg,
>  	struct cli_params	*cli,
> -	struct cli_params	*dft,
>  	struct zone_topology	*zt)
>  {
>  	if (!cli->xi->data.isfile) {
> @@ -6163,8 +6161,8 @@ main(
>  	 * Extract as much of the valid config as we can from the CLI input
>  	 * before opening the libxfs devices.
>  	 */
> -	validate_blocksize(&cfg, &cli, &bld_dft);
> -	validate_sectorsize(&cfg, &cli, &bld_dft, &ft, dry_run, force_overwrite);
> +	validate_blocksize(&cfg, &cli);
> +	validate_sectorsize(&cfg, &cli, &ft, dry_run, force_overwrite);
>  
>  	/*
>  	 * XXX: we still need to set block size and sector size global variables
> @@ -6173,8 +6171,8 @@ main(
>  	blocksize = cfg.blocksize;
>  	sectorsize = cfg.sectorsize;
>  
> -	validate_log_sectorsize(&cfg, &cli, &bld_dft, &ft);
> -	validate_zoned(&cfg, &cli, &bld_dft, &zt);
> +	validate_log_sectorsize(&cfg, &cli, &ft);
> +	validate_zoned(&cfg, &cli, &zt);
>  	validate_sb_features(&cfg, &cli);
>  
>  	/*
> -- 
> 2.54.0
> 
>