From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id C253B1FF0AA for ; Tue, 17 Nov 2026 21:41:57 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 0FCED217DD; Tue, 17 Nov 2026 21:40:53 +0100 (CET) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v3 13/51] storage: break up if-elsif chain in path_to_volume_id Date: Tue, 17 Nov 2026 21:38:45 +0100 Message-ID: <20261117203953.913035-14-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261117203953.913035-1-m.carrara@proxmox.com> References: <20261117203953.913035-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794948020792 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.266 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: YE7OY67KNM6VMZVYN2I3KK7YGKKSG2MQ X-Message-ID-Hash: YE7OY67KNM6VMZVYN2I3KK7YGKKSG2MQ X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Wolfgang Bumiller X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Done in order to make future changes a little easier. Signed-off-by: Max R. Carrara --- src/PVE/Storage.pm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 650d7f5f..840b3687 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -761,23 +761,35 @@ sub path_to_volume_id { if ($volpath eq $path) { my ($vtype) = $plugin->parse_volname($volname); return ($vtype, $info->{volid}); } } - } elsif ($path =~ m!^\Q$isodir\E/([^/]+$ISO_EXT_RE_0)$!) { + + return (''); + } + + if ($path =~ m!^\Q$isodir\E/([^/]+$ISO_EXT_RE_0)$!) { my $name = $1; return ('iso', "$sid:iso/$name"); - } elsif ($path =~ m!^\Q$tmpldir\E/([^/]+$VZTMPL_EXT_RE_1)$!) { + } + + if ($path =~ m!^\Q$tmpldir\E/([^/]+$VZTMPL_EXT_RE_1)$!) { my $name = $1; return ('vztmpl', "$sid:vztmpl/$name"); - } elsif ($path =~ m!^\Q$backupdir\E/([^/]+$BACKUP_EXT_RE_2)$!) { + } + + if ($path =~ m!^\Q$backupdir\E/([^/]+$BACKUP_EXT_RE_2)$!) { my $name = $1; return ('backup', "$sid:backup/$name"); - } elsif ($path =~ m!^\Q$snippetsdir\E/([^/]+)$!) { + } + + if ($path =~ m!^\Q$snippetsdir\E/([^/]+)$!) { my $name = $1; return ('snippets', "$sid:snippets/$name"); - } elsif ($path =~ m!^\Q$importdir\E/(${SAFE_CHAR_CLASS_RE}+${IMPORT_EXT_RE_1})$!) { + } + + if ($path =~ m!^\Q$importdir\E/(${SAFE_CHAR_CLASS_RE}+${IMPORT_EXT_RE_1})$!) { my $name = $1; return ('import', "$sid:import/$name"); } } -- 2.47.3