Re: [PATCH 11/12] xfs/157: do not drop necessary mkfs options

Zorro Lang
2024-11-21T10:03:25Z

On Mon, Nov 18, 2024 at 03:04:15PM -0800, Darrick J. Wong wrote:
> From: Zorro Lang <zlang@kernel.org>
>
> To give the test option "-L oldlabel" to _scratch_mkfs_sized, xfs/157
> does:
>
> MKFS_OPTIONS="-L oldlabel $MKFS_OPTIONS" _scratch_mkfs_sized $fs_size
>
> but the _scratch_mkfs_sized trys to keep the $fs_size, when mkfs
> fails with incompatible $MKFS_OPTIONS options, likes this:
>
> ** mkfs failed with extra mkfs options added to "-L oldlabel -m rmapbt=1" by test 157 **
> ** attempting to mkfs using only test 157 options: -d size=524288000 -b size=4096 **
>
> but the "-L oldlabel" is necessary, we shouldn't drop it. To avoid
> that, we give the "-L oldlabel" to _scratch_mkfs_sized through
> function parameters, not through global MKFS_OPTIONS.
>
> Signed-off-by: Zorro Lang <zlang@kernel.org>
> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
> [djwong: fix more string quoting issues]
> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> ---

Oh, you helped to merge the patchset at here. Thanks :)

> tests/xfs/157 | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>
> diff --git a/tests/xfs/157 b/tests/xfs/157
> index 9b5badbaeb3c76..e102a5a10abe4b 100755
> --- a/tests/xfs/157
> +++ b/tests/xfs/157
> @@ -66,8 +66,7 @@ scenario() {
> }
>
> check_label() {
> - MKFS_OPTIONS="-L oldlabel $MKFS_OPTIONS" _scratch_mkfs_sized $fs_size \
> - >> $seqres.full
> + _scratch_mkfs_sized "$fs_size" "" -L oldlabel >> $seqres.full 2>&1
> _scratch_xfs_db -c label
> _scratch_xfs_admin -L newlabel "$@" >> $seqres.full
> _scratch_xfs_db -c label
>