On Mon, Apr 29, 2024 at 07:05:48PM +0200, Christoph Hellwig wrote:
> _require_meta_uuid tries to check if the configuration supports the
> metauuid feature. It assumes a scratch fs has already been created,
> which in the part was accidentally true to do a _require_xfs_crc call
> that was removed in commit 39afc0aa237d ("xfs: remove support for tools
> and kernels without v5 support").
>
> As v5 file systems always support meta uuids, and xfs/077 forces a v5
> file systems we can just remove the check.
>
> Reported-by: Chandan Babu R <chandanbabu@xxxxxxxxxx>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> common/xfs | 15 ---------------
> tests/xfs/077 | 1 -
> 2 files changed, 16 deletions(-)
>
> diff --git a/common/xfs b/common/xfs
> index 733c3a5be..11481180b 100644
> --- a/common/xfs
> +++ b/common/xfs
> @@ -1232,21 +1232,6 @@ _require_scratch_xfs_shrink()
> _scratch_unmount
> }
>
> -# XFS ability to change UUIDs on V5/CRC filesystems
> -#
> -_require_meta_uuid()
> -{
OK, I thought you might want to add a _scratch_mkfs at here. But sure,
I'm good to remove it too.
Reviewed-by: Zorro Lang <zlang@xxxxxxxxxx>
> - _scratch_xfs_db -x -c "uuid restore" 2>&1 \
> - | grep -q "invalid UUID\|supported on V5 fs" \
> - && _notrun "Userspace doesn't support meta_uuid feature"
> -
> - _scratch_xfs_db -x -c "uuid generate" >/dev/null 2>&1
> -
> - _try_scratch_mount >/dev/null 2>&1 \
> - || _notrun "Kernel doesn't support meta_uuid feature"
> - _scratch_unmount
> -}
> -
> # this test requires mkfs.xfs have case-insensitive naming support
> _require_xfs_mkfs_ciname()
> {
> diff --git a/tests/xfs/077 b/tests/xfs/077
> index 37ea931f1..4c597fddd 100755
> --- a/tests/xfs/077
> +++ b/tests/xfs/077
> @@ -24,7 +24,6 @@ _supported_fs xfs
> _require_xfs_copy
> _require_scratch
> _require_no_large_scratch_dev
> -_require_meta_uuid
>
> # Takes 2 args, 2nd optional:
> # 1: generate, rewrite, or restore
> --
> 2.39.2
>
>
