From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 285A6704D2 for ; Thu, 24 Jun 2021 11:57:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 17FDF9410 for ; Thu, 24 Jun 2021 11:57:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9BE2292ED for ; Thu, 24 Jun 2021 11:57:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 67D0946782 for ; Thu, 24 Jun 2021 11:57:05 +0200 (CEST) Date: Thu, 24 Jun 2021 11:57:03 +0200 From: Wolfgang Bumiller To: Thomas Lamprecht Cc: Proxmox VE development discussion Message-ID: <20210624095703.f5u5czr7zsxbdqyy@wobu-vie.proxmox.com> References: <20210624084137.74018-1-w.bumiller@proxmox.com> <46fac331-b35e-f94e-8274-d902f94c3f11@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <46fac331-b35e-f94e-8274-d902f94c3f11@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.492 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URI_NOVOWEL 0.5 URI hostname has long non-vowel sequence Subject: Re: [pve-devel] [PATCH storage] btrfs: fix qgroup id and size in volume resize X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 09:57:36 -0000 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 > > --- > > 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.