From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Thomas Lamprecht <t.lamprecht@proxmox.com>
Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH storage] btrfs: fix qgroup id and size in volume resize
Date: Thu, 24 Jun 2021 11:57:03 +0200 [thread overview]
Message-ID: <20210624095703.f5u5czr7zsxbdqyy@wobu-vie.proxmox.com> (raw)
In-Reply-To: <46fac331-b35e-f94e-8274-d902f94c3f11@proxmox.com>
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@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.
prev parent reply other threads:[~2021-06-24 9:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 8:41 Wolfgang Bumiller
2021-06-24 9:24 ` Thomas Lamprecht
2021-06-24 9:57 ` Wolfgang Bumiller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210624095703.f5u5czr7zsxbdqyy@wobu-vie.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=t.lamprecht@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox