From: Christoph Hellwig <hch@lst.de>
To: zlang@kernel.org
Cc: djwong@kernel.org, fstests@vger.kernel.org,
linux-xfs@vger.kernel.org, chandanbabu@kernel.org
Subject: [PATCH] xfs/077: remove _require_meta_uuid
Date: Mon, 29 Apr 2024 19:05:48 +0200 [thread overview]
Message-ID: <20240429170548.1629224-1-hch@lst.de> (raw)
_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@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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()
-{
- _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
next reply other threads:[~2024-04-29 17:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 17:05 Christoph Hellwig [this message]
2024-04-30 12:35 ` [PATCH] xfs/077: remove _require_meta_uuid Chandan Babu R
2024-04-30 13:02 ` Zorro Lang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240429170548.1629224-1-hch@lst.de \
--to=hch@lst.de \
--cc=chandanbabu@kernel.org \
--cc=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=zlang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).