btrfs/316: use rescan wrapper

btrfs/316 is broken on the squota configuration because it uses a raw
rescan call which fails, instead of using the rescan wrapper. The test
passes with squota, so run it (instead of requiring rescan) though I
suspect it isn't the most meaningful test.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Boris Burkov <boris@bur.io>
Signed-off-by: Anand Jain <anand.jain@oracle.com>

diff --git a/tests/btrfs/316 b/tests/btrfs/316
index f78a023526c35d30144e7cd963ef9c64641cff90..63e9a7d98c11e99a42a2e5ffd258d1c3eef68507 100755 (executable)
--- a/tests/btrfs/316
+++ b/tests/btrfs/316
@@ -16,6 +16,7 @@ _begin_fstest auto quick qgroup
 
 _supported_fs btrfs
 _require_scratch
+_require_qgroup_rescan
 
 _fixed_by_kernel_commit d139ded8b9cd \
        "btrfs: qgroup: always free reserved space for extent records"
@@ -24,7 +25,7 @@ _scratch_mkfs >> $seqres.full
 _scratch_mount
 
 $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
-$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+_qgroup_rescan $SCRATCH_MNT >> $seqres.full
 
 $BTRFS_UTIL_PROG qgroup create 1/0 $SCRATCH_MNT >> $seqres.full
 $BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subv1 >> $seqres.full