From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 882371FF15E for <inbox@lore.proxmox.com>; Tue, 11 Feb 2025 17:09:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 381423591; Tue, 11 Feb 2025 17:08:47 +0100 (CET) From: Daniel Kral <d.kral@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 11 Feb 2025 17:08:19 +0100 Message-Id: <20250211160825.254167-26-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211160825.254167-1-d.kral@proxmox.com> References: <20250211160825.254167-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 container v2 05/11] alloc_disk: simplify storage-specific logic for vdisk_alloc arguments X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Since there are only two distinct outcomes, i.e. raw format + do_format and subvol format + needs_chown, break down the conditions to reduce the branching depth. Signed-off-by: Daniel Kral <d.kral@proxmox.com> --- changes since v1: - new! src/PVE/LXC.pm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 1152131..c634b70 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -2163,14 +2163,11 @@ sub alloc_disk { die "storage '$storage' does not support content type 'rootdir'\n" if !$scfg->{content}->{rootdir}; - if ($scfg->{path}) { - if ($size_kb > 0 && !($scfg->{type} eq 'btrfs' && $scfg->{quotas})) { - $do_format = 1; - } else { - $format = 'subvol'; - $needs_chown = 1; - } - } elsif ($scfg->{type} eq 'zfspool') { + my $is_unsized_on_path = $scfg->{path} && $size_kb <= 0; + my $is_btrfs_quotas = $scfg->{path} && $scfg->{type} eq 'btrfs' && $scfg->{quotas}; + my $is_zfs_pool = !$scfg->{path} && $scfg->{type} eq 'zfspool'; + + if ($is_unsized_on_path || $is_btrfs_quotas || $is_zfs_pool) { $format = 'subvol'; $needs_chown = 1; } else { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel