diff options
author | Darrick J. Wong <djwong@kernel.org> | 2023-07-05 08:38:19 -0700 |
---|---|---|
committer | Zorro Lang <zlang@kernel.org> | 2023-07-07 22:10:38 +0800 |
commit | 08389a5aaa29e374e26536c943b92f8c19e8e959 (patch) | |
tree | 143c23eeb4fd227154864a586c8f18c777fe4f89 | |
parent | cfa2c8fadbc8b38e6d507ee221b63857dd4b62fc (diff) | |
download | xfstests-dev-08389a5aaa29e374e26536c943b92f8c19e8e959.tar.gz |
xfs/439: amend test to work with new log geometry validation
An upcoming patch moves more log validation checks to the superblock
verifier, so update this test as needed.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
-rwxr-xr-x | tests/xfs/439 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/xfs/439 b/tests/xfs/439 index b7929493d1..3497e67cc1 100755 --- a/tests/xfs/439 +++ b/tests/xfs/439 @@ -20,8 +20,16 @@ _begin_fstest auto quick fuzzers log # real QA test starts here _supported_fs xfs _require_scratch_nocheck -# We corrupt XFS on purpose, and check if assert failures would crash system. -_require_no_xfs_bug_on_assert + +# We corrupt XFS on purpose, and check if assert failures would crash the +# system when trying to xfs_log_mount. Hence this is a regression test for: +_fixed_by_kernel_commit 9c92ee208b1f \ + "xfs: validate sb_logsunit is a multiple of the fs blocksize" + +# This used to be _require_no_xfs_bug_on_assert, but now we've fixed the sb +# verifier to reject this before xfs_log_mount gets to it: +_fixed_by_kernel_commit f1e1765aad7d \ + "xfs: journal geometry is not properly bounds checked" rm -f "$seqres.full" @@ -33,7 +41,7 @@ blksz=$(_scratch_xfs_get_sb_field blocksize) _scratch_xfs_set_sb_field logsunit $((blksz - 1)) >> $seqres.full 2>&1 # Check if logsunit is set correctly -lsunit=$(_scratch_xfs_get_sb_field logsunit) +lsunit=$(_scratch_xfs_get_sb_field logsunit 2>/dev/null) [ $lsunit -ne $((blksz - 1)) ] && _notrun "failed to set sb_logsunit" # Mount and writing log may trigger a crash on buggy kernel |