The enable_quota helper in btrfs/301 takes a mode argument ('n', 's',
or anything else) to switch between "no quota", "simple quota", and
"full quota" enable. Only the simple-quota path is ever exercised by
this test, so the dispatch is dead weight and the indirection just
obscures the actual btrfs command being run.
Inline the two call sites to call 'btrfs quota enable --simple'
directly and drop the helper.
Signed-off-by: Boris Burkov <boris@bur.io>
Reviewed-by: Anand Jain <asj@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
do_falloc $file $sz
}
-enable_quota()
-{
- local mode=$1
-
- [ $mode == "n" ] && return
- arg=$([ $mode == "s" ] && echo "--simple")
-
- $BTRFS_UTIL_PROG quota enable $arg $SCRATCH_MNT
-}
-
get_subvid()
{
_btrfs_get_subvolid $SCRATCH_MNT subv
{
_scratch_mkfs >> $seqres.full
_scratch_mount
- enable_quota "s"
+ $BTRFS_UTIL_PROG quota enable --simple $SCRATCH_MNT
$BTRFS_UTIL_PROG subvolume create $subv >> $seqres.full
local subvid=$(get_subvid)
set_subvol_limit $subvid $limit
# Sync before enabling squotas to reliably *not* count the writes
# we did before enabling.
sync
- enable_quota "s"
+ $BTRFS_UTIL_PROG quota enable --simple $SCRATCH_MNT
set_subvol_limit $subvid $limit
_scratch_cycle_mount
usage=$(get_subvol_usage $subvid)