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 E5CD474C87 for ; Tue, 22 Jun 2021 14:19:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 38A292727A for ; Tue, 22 Jun 2021 14:18:41 +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 AE0B427003 for ; Tue, 22 Jun 2021 14:18:35 +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 8205D44FB4 for ; Tue, 22 Jun 2021 14:18:35 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 22 Jun 2021 14:18:27 +0200 Message-Id: <20210622121828.84178-9-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210622121828.84178-1-w.bumiller@proxmox.com> References: <20210622121828.84178-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.806 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 Subject: [pve-devel] [PATCH v2 container 3/3] special case btrfs+quotas to use subvolumes 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: Tue, 22 Jun 2021 12:19:12 -0000 Signed-off-by: Wolfgang Bumiller --- New in v2. src/PVE/LXC.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 0a8a532..fc06842 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1893,7 +1893,7 @@ sub alloc_disk { eval { my $do_format = 0; if ($scfg->{content}->{rootdir} && $scfg->{path}) { - if ($size_kb > 0) { + if ($size_kb > 0 && !($scfg->{type} eq 'btrfs' && $scfg->{quotas})) { $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw', undef, $size_kb); $do_format = 1; } else { -- 2.30.2