FSTests Archive on lore.kernel.org
 help / color / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me,
	Brian Foster <bfoster@redhat.com>
Subject: [PATCH v1.2 5/5] xfs/49[12]: skip pre-lazysbcount filesystems
Date: Wed, 28 Apr 2021 18:31:54 -0700
Message-ID: <20210429013154.GL3122235@magnolia> (raw)
In-Reply-To: <161958296475.3452351.7075798777673076839.stgit@magnolia>

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

Prior to lazysbcount, the xfs mount code blindly trusted the value of
the fdblocks counter in the primary super, which means that the kernel
doesn't detect the fuzzed fdblocks value at all.  V4 is deprecated and
pre-lazysbcount V4 hasn't been the default for ~14 years, so we'll just
skip these two tests on those old filesystems.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
v1.2: factor the feature checking into a separate helper
---
 common/xfs    |   12 ++++++++++++
 tests/xfs/491 |    4 ++++
 tests/xfs/492 |    4 ++++
 3 files changed, 20 insertions(+)

diff --git a/common/xfs b/common/xfs
index 8501b084..92383061 100644
--- a/common/xfs
+++ b/common/xfs
@@ -1129,6 +1129,18 @@ _check_scratch_xfs_features()
 	test "${found}" -eq "$#"
 }
 
+# Skip a test if any of the given fs features aren't present on the scratch
+# filesystem.  The scratch fs must have been formatted already.
+_require_scratch_xfs_features()
+{
+	local features="$(_scratch_xfs_db -c 'version' 2>/dev/null)"
+
+	for feature in "$@"; do
+		echo "${features}" | grep -q -w "${feature}" ||
+			_notrun "Missing scratch feature: ${feature}"
+	done
+}
+
 # Decide if xfs_repair knows how to set (or clear) a filesystem feature.
 _require_xfs_repair_upgrade()
 {
diff --git a/tests/xfs/491 b/tests/xfs/491
index 6420202b..7d447ccf 100755
--- a/tests/xfs/491
+++ b/tests/xfs/491
@@ -36,6 +36,10 @@ _require_scratch
 
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
+
+# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
+_require_scratch_xfs_features LAZYSBCOUNT
+
 _scratch_mount >> $seqres.full 2>&1
 echo "test file" > $SCRATCH_MNT/testfile
 
diff --git a/tests/xfs/492 b/tests/xfs/492
index 522def47..21c6872f 100755
--- a/tests/xfs/492
+++ b/tests/xfs/492
@@ -36,6 +36,10 @@ _require_scratch
 
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
+
+# pre-lazysbcount filesystems blindly trust the primary sb fdblocks
+_require_scratch_xfs_features LAZYSBCOUNT
+
 _scratch_mount >> $seqres.full 2>&1
 echo "test file" > $SCRATCH_MNT/testfile
 

  parent reply index

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-28  4:08 [PATCHSET 0/5] fstests: miscellaneous fixes Darrick J. Wong
2021-04-28  4:09 ` [PATCH 1/5] xfs/276: remove unnecessary mkfs golden output Darrick J. Wong
2021-04-28 17:47   ` Brian Foster
2021-04-28  4:09 ` [PATCH 2/5] generic/{094,225}: fix argument to _require_file_block_size_equals_fs_block_size Darrick J. Wong
2021-04-28 17:47   ` Brian Foster
2021-04-28  4:09 ` [PATCH 3/5] generic/449: always fill up the data device Darrick J. Wong
2021-04-28 17:47   ` Brian Foster
2021-04-29  0:39     ` Darrick J. Wong
2021-04-28  4:09 ` [PATCH 4/5] xfs/004: don't fail test due to realtime files Darrick J. Wong
2021-04-28 17:47   ` Brian Foster
2021-04-28  4:09 ` [PATCH 5/5] xfs/49[12]: skip pre-lazysbcount filesystems Darrick J. Wong
2021-04-28 17:47   ` Brian Foster
2021-04-29  0:44     ` Darrick J. Wong
2021-04-29  1:31   ` Darrick J. Wong [this message]
2021-04-29 13:30     ` [PATCH v1.2 " Brian Foster

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=20210429013154.GL3122235@magnolia \
    --to=djwong@kernel.org \
    --cc=bfoster@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=guan@eryu.me \
    --cc=guaneryu@gmail.com \
    --cc=linux-xfs@vger.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

FSTests Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/fstests/0 fstests/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 fstests fstests/ https://lore.kernel.org/fstests \
		fstests@vger.kernel.org
	public-inbox-index fstests

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.fstests


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git