[PATCH] xfs/030: skip this test if metadir gets enabled anyway

[PATCH] xfs/030: skip this test if metadir gets enabled anyway

[Darrick J. Wong]

From: Darrick J. Wong <djwong@kernel.org>

This test requires metadir not to be enabled, but under certain
circumstances (aka _scratch_mkfs_xfs trying to be helpful and dropping
MKFS_OPTIONS) it can get enabled anyway if mkfs.xfs defaults to enabling
metadir.  Check the fs feature set after formatting and skip the test if
metadir gets enabled.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
 tests/xfs/030 |    1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/xfs/030 b/tests/xfs/030
index 22fbdb2fdbc999..d0b8f413bb9afd 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -72,6 +72,7 @@ else
 		_notrun "PQuota are enabled, test needs controlled sb recovery"
 	_scratch_unmount
 fi
+_xfs_has_feature "$SCRATCH_DEV" metadir && _notrun "metadir enabled anyway"
 clear=""
 eval `_scratch_xfs_db -r -c "sb 1" -c stack | perl -ne '
 	if (/byte offset (\d+), length (\d+)/) {

Re: [PATCH] xfs/030: skip this test if metadir gets enabled anyway

[Zorro Lang]

On Wed, Aug 26, 2026 at 11:30:26AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> This test requires metadir not to be enabled, but under certain
> circumstances (aka _scratch_mkfs_xfs trying to be helpful and dropping
> MKFS_OPTIONS) it can get enabled anyway if mkfs.xfs defaults to enabling
> metadir.  Check the fs feature set after formatting and skip the test if
> metadir gets enabled.
> 
> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> ---
>  tests/xfs/030 |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/xfs/030 b/tests/xfs/030
> index 22fbdb2fdbc999..d0b8f413bb9afd 100755
> --- a/tests/xfs/030
> +++ b/tests/xfs/030
> @@ -72,6 +72,7 @@ else
>  		_notrun "PQuota are enabled, test needs controlled sb recovery"
>  	_scratch_unmount
>  fi
> +_xfs_has_feature "$SCRATCH_DEV" metadir && _notrun "metadir enabled anyway"

Reviewed-by: Zorro Lang <zlang@kernel.org>

>  clear=""
>  eval `_scratch_xfs_db -r -c "sb 1" -c stack | perl -ne '
>  	if (/byte offset (\d+), length (\d+)/) {