From: Boris Burkov Date: Wed, 13 Mar 2024 23:46:30 +0000 (-0700) Subject: btrfs/316: use rescan wrapper X-Git-Tag: v2024.03.31~16 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=76bb0038ff8ec861d9e027925adc7cfedb719d53;p=xfstests-dev.git 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 Reviewed-by: Anand Jain Signed-off-by: Boris Burkov Signed-off-by: Anand Jain --- diff --git a/tests/btrfs/316 b/tests/btrfs/316 index f78a0235..63e9a7d9 100755 --- 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