btrfs: make sure we rescan all devices after unregistering

[xfstests-dev.git] / tests / btrfs / 125

diff --git a/tests/btrfs/125 b/tests/btrfs/125
index 847fa62ad25fb8e6de72e55c1d3f3ba235f0d798..d125b111ebf2a44651ef87e394545d877c882765 100755 (executable)
--- a/tests/btrfs/125
+++ b/tests/btrfs/125
@@ -34,6 +34,7 @@ _cleanup()
 {
        cd /
        rm -f $tmp.*
+       _btrfs_rescan_devices
 }
 
 # get standard environment, filters and checks
@@ -47,10 +48,9 @@ rm -f $seqres.full
 # real QA test starts here
 
 _supported_fs btrfs
-_supported_os Linux
 _require_scratch_dev_pool 3
 _test_unmount
-_require_loadable_fs_module "btrfs"
+_require_btrfs_forget_or_module_loadable
 _require_btrfs_fs_feature raid56
 
 _scratch_dev_pool_get 3
@@ -103,7 +103,7 @@ echo "unmount" >> $seqres.full
 _scratch_unmount
 echo "clean btrfs ko" >> $seqres.full
 # un-scan the btrfs devices
-_reload_fs_module "btrfs"
+_btrfs_forget_or_module_reload
 _mount -o degraded,device=$dev2 $dev1 $SCRATCH_MNT >>$seqres.full 2>&1
 dd if=/dev/zero of="$SCRATCH_MNT"/tf2 bs=$bs count=$count \
                                        >>$seqres.full 2>&1
@@ -123,7 +123,7 @@ _run_btrfs_util_prog device scan
 _scratch_mount >> $seqres.full 2>&1
 
 echo >> $seqres.full
-_run_btrfs_util_prog balance start ${SCRATCH_MNT}
+_run_btrfs_balance_start $SCRATCH_MNT >> $seqres.full
 
 _run_btrfs_util_prog filesystem show
 _run_btrfs_util_prog filesystem df ${SCRATCH_MNT}
@@ -139,7 +139,7 @@ echo "Mount degraded but with other dev"
 
 _scratch_unmount
 # un-scan the btrfs devices
-_reload_fs_module "btrfs"
+_btrfs_forget_or_module_reload
 
 _mount -o degraded,device=${dev2} $dev3 $SCRATCH_MNT >>$seqres.full 2>&1
 
@@ -162,6 +162,7 @@ fi
 
 $UMOUNT_PROG $dev2
 _scratch_dev_pool_put
+_btrfs_rescan_devices
 _test_mount
 
 status=0