From: Darrick J. Wong <djwong@xxxxxxxxxx> 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@xxxxxxxxxx> --- tests/xfs/439 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/xfs/439 b/tests/xfs/439 index b7929493d1..8c69ece655 100755 --- a/tests/xfs/439 +++ b/tests/xfs/439 @@ -21,7 +21,9 @@ _begin_fstest auto quick fuzzers log _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 +# 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 XXXXXXXXXXXX "xfs: journal geometry is not properly bounds checked" rm -f "$seqres.full" @@ -33,7 +35,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
