fstests: remove _require_no_rtinherit completely

The _require_no_rtinherit has been removed by:
  0ac0d8fb ("common: remove _require_no_rtinherit")

But some cases still remain the _require_no_rtinherit, so remove
them all.

Signed-off-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/generic/250 b/tests/generic/250
index eaa2f88419ca497694ba5ddda18251c7a34a8e4e..102bf500f4b2111838498576e2d9ada0de16cf6c 100755 (executable)
--- a/tests/generic/250
+++ b/tests/generic/250
@@ -33,12 +33,13 @@ _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
 _require_odirect
 _require_dm_target error
 _require_xfs_io_command "falloc"
 _require_odirect

-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit

 
 rm -f $seqres.full
 
 
 rm -f $seqres.full
 

+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+

 fssize=$((196 * 1048576))
 echo "Format and mount"
 $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
 fssize=$((196 * 1048576))
 echo "Format and mount"
 $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full

diff --git a/tests/generic/252 b/tests/generic/252
index 61369759d40e431fcd8434bd604381b0c75e9820..809e8020433788b54d6cbab199b3e76611464089 100755 (executable)
--- a/tests/generic/252
+++ b/tests/generic/252
@@ -32,14 +32,14 @@ _cleanup()
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"

-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit

 _require_aiodio "aiocp"
 AIO_TEST="$here/src/aio-dio-regress/aiocp"
 
 rm -f $seqres.full
 
 _require_aiodio "aiocp"
 AIO_TEST="$here/src/aio-dio-regress/aiocp"
 
 rm -f $seqres.full
 

+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV

 
 fssize=$((196 * 1048576))
 echo "Format and mount"
 
 fssize=$((196 * 1048576))
 echo "Format and mount"

diff --git a/tests/generic/441 b/tests/generic/441
index 6ad449bb27c4eb3008bd9748754b8bed4b76dcfd..bedbcb081791ce03e7f13a2586edd6ac181e093a 100755 (executable)
--- a/tests/generic/441
+++ b/tests/generic/441
@@ -32,9 +32,6 @@ _cleanup()
 
 # real QA test starts here
 _require_scratch
 
 # real QA test starts here
 _require_scratch

-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit

 
 # Generally, we want to avoid journal errors on the extended testcase. Only
 # unset the -s flag if we have a logdev
 
 # Generally, we want to avoid journal errors on the extended testcase. Only
 # unset the -s flag if we have a logdev


@@ -57,6 +54,10 @@ _require_test_program dmerror
 
 rm -f $seqres.full
 
 
 rm -f $seqres.full
 

+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+

 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init

diff --git a/tests/generic/484 b/tests/generic/484
index ad39e45beb56027cab691ad5f50c882978ae84ad..331cd1ad584b25946b83b39faf689f711dfed5b0 100755 (executable)
--- a/tests/generic/484
+++ b/tests/generic/484
@@ -37,14 +37,15 @@ _cleanup()
 
 # real QA test starts here
 _require_scratch_nocheck
 
 # real QA test starts here
 _require_scratch_nocheck

-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit

 _require_dm_target error
 _require_xfs_io_command "syncfs"
 
 rm -f $seqres.full
 
 _require_dm_target error
 _require_xfs_io_command "syncfs"
 
 rm -f $seqres.full
 

+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+

 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init

diff --git a/tests/generic/487 b/tests/generic/487
index 197b23852b4e8010c6ff420fffd513bb06cd99df..1aa97ada72fc977d8fb0bc544b198f13288ef4af 100755 (executable)
--- a/tests/generic/487
+++ b/tests/generic/487
@@ -32,9 +32,6 @@ _cleanup()
 
 # real QA test starts here
 _require_scratch_nocheck
 
 # real QA test starts here
 _require_scratch_nocheck

-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit

 
 sflag='-s'
 case $FSTYP in
 
 sflag='-s'
 case $FSTYP in


@@ -50,6 +47,10 @@ _require_dm_target error
 
 rm -f $seqres.full
 
 
 rm -f $seqres.full
 

+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+

 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init