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

fstests: Use _require_scratch_dax_mountopt() and _require_dax_iflag()

Browse Source 
1) Make related tests use _require_scratch_dax_mountopt() and _require_dax_iflag().
2) Remove unused _require_scratch_dax().

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Xiao Yang
2020-08-06 10:13:36 +08:00
committed by Eryu Guan
parent c1a28a6e3a
commit 49ba983a76
6 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/rc
-14
View File
@@ -3174,20 +3174,6 @@ _require_scratch_shutdown()
_scratch_unmount
}
# Does dax mount option work on this dev/fs?
_require_scratch_dax()
{
_require_scratch
_scratch_mkfs > /dev/null 2>&1
_try_scratch_mount -o dax || \
_notrun "mount $SCRATCH_DEV with dax failed"
# Check options to be sure. XFS ignores dax option
# and goes on if dev underneath does not support dax.
_fs_options $SCRATCH_DEV | grep -qw "dax" || \
_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
_scratch_unmount
}
# Check if dax mount options are supported
#
# $1 can be either 'dax=always' or 'dax'
tests/ext4/030
+1 -1
View File
@@ -33,7 +33,7 @@ rm -f $seqres.full
# Modify as appropriate.
_supported_os Linux
_supported_fs ext4
_require_scratch_dax
_require_scratch_dax_mountopt "dax"
_require_test_program "t_ext4_dax_journal_corruption"
_require_command "$CHATTR_PROG" chattr
tests/ext4/031
+2 -2
View File
@@ -37,7 +37,7 @@ MOUNT_OPTIONS=""
# Modify as appropriate.
_supported_os Linux
_supported_fs ext4
_require_scratch_dax
_require_scratch_dax_mountopt "dax"
_require_test_program "t_ext4_dax_inline_corruption"
_require_scratch_ext4_feature "inline_data"
@@ -56,7 +56,7 @@ _scratch_unmount >> $seqres.full 2>&1
_try_scratch_mount "-o dax" >> $seqres.full 2>&1
if [[ $? != 0 ]]; then
# _require_scratch_dax already verified that we could mount with DAX.
# _require_scratch_dax_mountopt already verified that we could mount with DAX.
# Failure here is expected because we have inline data.
echo "Silence is golden"
status=0
tests/generic/413
+1 -1
View File
@@ -31,7 +31,7 @@ rm -f $seqres.full
_supported_fs generic
_supported_os Linux
_require_test
_require_scratch_dax
_require_scratch_dax_mountopt "dax"
_require_test_program "feature"
_require_test_program "t_mmap_dio"
_require_xfs_io_command "falloc"
tests/generic/462
+1 -1
View File
@@ -37,7 +37,7 @@ rm -f $seqres.full
_supported_fs generic
_supported_os Linux
_require_test
_require_scratch_dax
_require_scratch_dax_mountopt "dax"
_require_test_program "t_mmap_write_ro"
# running by unpriviliged user is not necessary to reproduce
# this bug, just trying to test more.
tests/xfs/260
+2 -2
View File
@@ -30,10 +30,10 @@ rm -f $seqres.full
_supported_fs xfs
_supported_os Linux
_require_scratch_dax
_require_scratch_dax_mountopt "dax"
_require_test_program "feature"
_require_test_program "t_mmap_dio"
_require_xfs_io_command "chattr" "x"
_require_dax_iflag
_require_xfs_io_command "falloc"
prep_files()