On Tue, Jul 14, 2020 at 05:40:04PM +0800, Xiao Yang wrote:
> 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@xxxxxxxxxxxxxx>
> Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx>
Looks ok to me,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
>
> V5->V6:
> Merge the third patch into the second patch.
>
> common/rc | 13 -------------
> tests/ext4/030 | 2 +-
> tests/ext4/031 | 4 ++--
> tests/generic/413 | 2 +-
> tests/generic/462 | 2 +-
> tests/xfs/260 | 4 ++--
> 6 files changed, 7 insertions(+), 20 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index aeec1f11..6c908f2e 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3175,19 +3175,6 @@ _require_scratch_shutdown()
> }
>
> # 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
> -}
> -
> # Only accept dax/dax=always mount option becasue dax=always, dax=inode
> # and dax=never are always introduced together.
> _require_scratch_dax_mountopt()
> diff --git a/tests/ext4/030 b/tests/ext4/030
> index 93bbca86..fb5cf451 100755
> --- 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 dc58214e..20e2fab7 100755
> --- 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 1ce89aff..19e1b926 100755
> --- 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 1ab6cadc..4a940239 100755
> --- 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 3464ffef..bcdc6041 100755
> --- 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()
> --
> 2.21.0
>
>
>
