On Thu, Jan 11, 2024 at 03:24:06PM +0100, Christoph Hellwig wrote:
> Add a helper to call _supports_xfs_scrub with $SCRATCH_MNT and
> $SCRATCH_DEV.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Thanks for the cleanup,
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> common/xfs | 7 +++++++
> tests/xfs/556 | 2 +-
> tests/xfs/716 | 2 +-
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/common/xfs b/common/xfs
> index 9db998837..bfe979dbb 100644
> --- a/common/xfs
> +++ b/common/xfs
> @@ -661,6 +661,13 @@ _supports_xfs_scrub()
> return 0
> }
>
> +# Does the scratch file system support scrub?
> +_scratch_require_xfs_scrub()
> +{
> + _supports_xfs_scrub $SCRATCH_MNT $SCRATCH_DEV || \
> + _notrun "Scrub not supported"
> +}
> +
> # Save a snapshot of a corrupt xfs filesystem for later debugging.
> _xfs_metadump() {
> local metadump="$1"
> diff --git a/tests/xfs/556 b/tests/xfs/556
> index 061d8d572..6be993273 100755
> --- a/tests/xfs/556
> +++ b/tests/xfs/556
> @@ -40,7 +40,7 @@ _scratch_mkfs >> $seqres.full
> _dmerror_init
> _dmerror_mount >> $seqres.full 2>&1
>
> -_supports_xfs_scrub $SCRATCH_MNT $SCRATCH_DEV || _notrun "Scrub not supported"
> +_scratch_require_xfs_scrub
>
> # Write a file with 4 file blocks worth of data
> victim=$SCRATCH_MNT/a
> diff --git a/tests/xfs/716 b/tests/xfs/716
> index 930a0ecbb..4cfb27f18 100755
> --- a/tests/xfs/716
> +++ b/tests/xfs/716
> @@ -31,7 +31,7 @@ _require_test_program "punch-alternating"
> _scratch_mkfs > $tmp.mkfs
> _scratch_mount
>
> -_supports_xfs_scrub $SCRATCH_MNT $SCRATCH_DEV || _notrun "Scrub not supported"
> +_scratch_require_xfs_scrub
>
> # Force data device extents so that we can create a file with the exact bmbt
> # that we need regardless of rt configuration.
> --
> 2.39.2
>
