From ed9251da1e262d3c26a8f1eb07cad2a3fbd677b9 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 4 Oct 2018 17:19:26 -0700 Subject: [PATCH] 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 --- tests/xfs/189 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/xfs/189 b/tests/xfs/189 index c1c52a22..2a2682ef 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 -- 2.30.2