From: Darrick J. Wong Date: Fri, 5 Oct 2018 00:19:26 +0000 (-0700) Subject: xfs/189: skip 'barrier' mount option test on newer kernels X-Git-Tag: v2022.05.01~1380 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed9251da1e262d3c26a8f1eb07cad2a3fbd677b9;p=users%2Fhch%2Fxfstests-dev.git xfs/189: skip 'barrier' mount option test on newer kernels Starting in Linux 4.19 the 'barrier' and 'nobarrier' mount options were removed. If mount complains about a bad option when we remount with 'barrier', just skip the test. Signed-off-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/tests/xfs/189 b/tests/xfs/189 index c1c52a225..2a2682efe 100755 --- a/tests/xfs/189 +++ b/tests/xfs/189 @@ -165,7 +165,19 @@ _test_remount_barrier() echo # mention barrier explicitly even if it's currently the default just to be sure - _try_scratch_mount -o barrier + _try_scratch_mount -o barrier > $tmp.barriermount 2>&1 + + # If the kernel doesn't recognize 'barrier' as a mount option then + # just fake the output. The barrier option was removed in 4.19. + if grep -q "bad option" $tmp.barriermount; then + cat << ENDL +SCRATCH_DEV on SCRATCH_MNT type xfs (rw) +SCRATCH_DEV on SCRATCH_MNT type xfs (rw,nobarrier) +SCRATCH_DEV on SCRATCH_MNT type xfs (rw) +ENDL + return + fi + [ $? -eq 0 ] || echo "mount failed unexpectedly!" _check_mount rw