Re: [PATCH 1/2] btrfs: inline enable_quota helper in test 301

On Thu, May 14, 2026 at 11:34:00AM +0800, Zorro Lang wrote:
> On Tue, May 12, 2026 at 05:43:33PM -0700, Boris Burkov wrote:
> > 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 <[email protected]>
> > ---
> 
> Hahah, to be honest, the title '[PATCH 0/2] squota delete fstests' gave me
> a minor heart attack. I thought it was a critical bug report about fstests
> accidentally deleting itself while running :-D
> 

Oops, sorry!

> >  tests/btrfs/301 | 14 ++------------
> >  1 file changed, 2 insertions(+), 12 deletions(-)
> > 
> > diff --git a/tests/btrfs/301 b/tests/btrfs/301
> > index 1f72a97b..31243aab 100755
> > --- a/tests/btrfs/301
> > +++ b/tests/btrfs/301
> > @@ -169,16 +169,6 @@ do_enospc_falloc()
> >  	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
> > @@ -198,7 +188,7 @@ prepare()
> >  {
> >  	_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
> > @@ -421,7 +411,7 @@ enable_mature()
> >  	# 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
> 
> This change doesn't seem related to patch 2/2. I think we can review
> these 2 patches separately.
> 
> For this patch, I'm fine with or without it. If the btrfs list prefers
> to have it, or move it to be a common helper, I'm good with that.
> 
> Thanks,
> Zorro
> 

I pulled this into a separate patch based on Filipe's feedback on the
old version I failed to get in. Agreed it doesn't need to be a series,
just felt related enough to send in a batch, due to the context.

Thanks for taking a look,
Boris

> >  	set_subvol_limit $subvid $limit
> >  	_scratch_cycle_mount
> >  	usage=$(get_subvol_usage $subvid)
> > -- 
> > 2.54.0
> > 
> >