Re: [PATCH v2 2/3] btrfs/053: fix test failure when running with btrfs-progs v6.0+

From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: fdmanana@kernel.org, fstests@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, Filipe Manana <fdmanana@suse.com>
Subject: Re: [PATCH v2 2/3] btrfs/053: fix test failure when running with btrfs-progs v6.0+
Date: Mon, 14 Nov 2022 19:08:53 +0800	[thread overview]
Message-ID: <4bb1fde6-5853-8a4f-bf9d-1488d6e92283@gmx.com> (raw)
In-Reply-To: <793a063833727ea80a1d0c6f13f531cff9581a1a.1668011940.git.fdmanana@suse.com>


On 2022/11/10 00:44, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> In btrfs-progs v6.0 the --leafsize (-l) command line option was removed
> from mkfs.btrfs, so btrfs/053 can fail with v6.0+ in case the scratch
> device does not have a btrfs filesystem created before running the test,
> in which case mounting the scratch device fails.
> 
> The change was introduced by the following btrfs-progs commit:
> 
>    f7a768d62498 ("btrfs-progs: mkfs: remove support for option --leafsize")
> 
> Change the test to use --nodesize (-n) instead, since it exists in both
> old and new btrfs-progs versions. Also redirect mkfs output to the test's
> log file and fail explicitly if mkfs failed.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu
> ---
>   tests/btrfs/053 | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/btrfs/053 b/tests/btrfs/053
> index fbd2e7d9..67239f10 100755
> --- a/tests/btrfs/053
> +++ b/tests/btrfs/053
> @@ -44,7 +44,7 @@ send_files_dir=$TEST_DIR/btrfs-test-$seq
>   rm -fr $send_files_dir
>   mkdir $send_files_dir
>   
> -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1
> +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed"
>   _scratch_mount
>   
>   echo "hello world" > $SCRATCH_MNT/foobar
> @@ -72,7 +72,7 @@ _run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \
>   _scratch_unmount
>   _check_scratch_fs
>   
> -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1
> +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed"
>   _scratch_mount
>   
>   _run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT