Re: [PATCH] common/config: support f2fs-tools v1.9 and later

[Eryu Guan <guaneryu@gmail.com>]

On Thu, Apr 05, 2018 at 03:19:01PM -0700, Eric Biggers wrote:
> Pass the -f option to mkfs.f2fs when it appears to support it.  This is
> required by f2fs-tools v1.9 and later in order to format the filesystem
> even when an existing filesystem is detected.  But earlier versions did
> not accept this option.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Looks fine to me, but I'd like an ACK from f2fs developers.

> ---
>  common/config | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/common/config b/common/config
> index 20f0e5f3..7c046a78 100644
> --- a/common/config
> +++ b/common/config
> @@ -94,10 +94,11 @@ set_prog_path()
>  	type -P $1
>  }
>  
> -# Handle mkfs.btrfs which does (or does not) require -f to overwrite
> -set_btrfs_mkfs_prog_path_with_opts()
> +# Handle mkfs.$fstyp which does (or does not) require -f to overwrite
> +set_mkfs_prog_path_with_opts()
>  {
> -	p=`set_prog_path mkfs.btrfs`
> +	local fstyp=$1
> +	local p=`set_prog_path mkfs.$fstyp`
>  	if [ "$p" != "" ] && grep -q 'force overwrite' $p; then

Also grep the "$p -h" output instead of the binary file?

Thanks,
Eryu

>  		echo "$p -f"
>  	else
> @@ -223,8 +224,8 @@ case "$HOSTOS" in
>          export MKFS_XFS_PROG="`set_prog_path mkfs.xfs`"
>          export MKFS_EXT4_PROG="`set_prog_path mkfs.ext4`"
>          export MKFS_UDF_PROG="`set_prog_path mkudffs`"
> -        export MKFS_BTRFS_PROG="`set_btrfs_mkfs_prog_path_with_opts`"
> -        export MKFS_F2FS_PROG="`set_prog_path mkfs.f2fs`"
> +        export MKFS_BTRFS_PROG="`set_mkfs_prog_path_with_opts btrfs`"
> +        export MKFS_F2FS_PROG="`set_mkfs_prog_path_with_opts f2fs`"
>          export DUMP_F2FS_PROG="`set_prog_path dump.f2fs`"
>          export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
>          export BTRFS_SHOW_SUPER_PROG="`set_prog_path btrfs-show-super`"
> -- 
> 2.17.0.484.g0c8726318c-goog
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html