apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfs/189: skip 'barrier' mount option test on newer kernels

Browse Source 
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 <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2018-10-04 17:19:26 -07:00
committed by Eryu Guan
parent a62490a118
commit ed9251da1e
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xfs/189
+13 -1
View File
@@ -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