fstests: Use _require_scratch_dax_mountopt() and _require_dax_iflag()

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>

diff --git a/common/rc b/common/rc
index fa70453d63276b0e7a1dfa8598cd755ac1fb0dd0..359d03ade8fb845f7d35386f81150182080857ce 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -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'

diff --git a/tests/ext4/030 b/tests/ext4/030
index 93bbca860d02685468422d403fb69f3ffd4fd46c..fb5cf451a1497bb594a0e3a631d83e6aacfe6bc6 100755 (executable)
--- a/tests/ext4/030
+++ b/tests/ext4/030
@@ -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
 

diff --git a/tests/ext4/031 b/tests/ext4/031
index dc58214e361288faae8582e788c4c2887791d72d..20e2fab71df5d8a7490f3877c0ab9049e82e19bb 100755 (executable)
--- a/tests/ext4/031
+++ b/tests/ext4/031
@@ -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

diff --git a/tests/generic/413 b/tests/generic/413
index 1ce89afff28e839b0a43f1fd17541f0f7a293e73..19e1b9261e32810867cc7b59681398849fb34082 100755 (executable)
--- a/tests/generic/413
+++ b/tests/generic/413
@@ -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"

diff --git a/tests/generic/462 b/tests/generic/462
index 1ab6cadc3603534e5e0b05fad9a1b5ad06db9474..4a9402396fdbf6d124c253fa124a78b913808715 100755 (executable)
--- a/tests/generic/462
+++ b/tests/generic/462
@@ -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.

diff --git a/tests/xfs/260 b/tests/xfs/260
index 3464ffef5a7a009170f81eb9748710224ee373c6..bcdc60414b6a71a5587303c245dc16dbeef9f80a 100755 (executable)
--- a/tests/xfs/260
+++ b/tests/xfs/260
@@ -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()