[pve-devel] [PATCH storage] btrfs: fix qgroup id and size in volume resize

[Wolfgang Bumiller]

On Thu, Jun 24, 2021 at 11:24:15AM +0200, Thomas Lamprecht wrote:
> On 24.06.21 10:41, Wolfgang Bumiller wrote:
> > also fixes volume_size_info in scalar context for subvols
> > 
> > Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
> > ---
> >  PVE/Storage/BTRFSPlugin.pm | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/PVE/Storage/BTRFSPlugin.pm b/PVE/Storage/BTRFSPlugin.pm
> > index 6ae93c2..0d8bf4b 100644
> > --- a/PVE/Storage/BTRFSPlugin.pm
> > +++ b/PVE/Storage/BTRFSPlugin.pm
> > @@ -489,7 +489,7 @@ sub volume_size_info {
> >  	if ($scfg->{quotas}) {
> >  	    ($used, $size) = btrfs_subvol_quota($class, $path);
> >  	}
> > -	return wantarray ? ($size, 'subvol', $used, undef, $ctime) : 1;
> > +	return wantarray ? ($size, 'subvol', $used, undef, $ctime) : $size;
> >      }
> >  
> >      return PVE::Storage::Plugin::file_size_info($path, $timeout);
> > @@ -504,8 +504,8 @@ sub volume_resize {
> >  	    if !$scfg->{quotas};
> >  
> >  	my $path = $class->filesystem_path($scfg, $volname);
> > -	my $id = '0/' . $class->btrfs_get_subvol_id($path);
> > -	$class->btrfs_cmd(['qgroup', 'limit', '--', "${size}k", "0/$id", $path]);
> > +	my $qid = '0/' . $class->btrfs_get_subvol_id($path);
> > +	$class->btrfs_cmd(['qgroup', 'limit', '--', $size, $qid, $path]);
> >  	return undef;
> >      }
> >  
> > 
> 
> does not applies, and it seems that it neither did before the "check for btrfs" + my
> followup patches..

My bad, this was on top of the fixed quotas support.