From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 2B8891FF13F for ; Thu, 23 Apr 2026 11:46:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 255D61078D; Thu, 23 Apr 2026 11:46:56 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v2 1/3] plugin: use guard clause to reduce nesting Date: Thu, 23 Apr 2026 11:46:14 +0200 Message-ID: <20260423094619.205988-2-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260423094619.205988-1-m.carrara@proxmox.com> References: <20260423094619.205988-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: 1776937492666 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.082 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 Message-ID-Hash: BPNZCNNQ47SGU2HA7VHULPHSBJ4XYAB3 X-Message-ID-Hash: BPNZCNNQ47SGU2HA7VHULPHSBJ4XYAB3 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 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Max R. Carrara --- src/PVE/Storage/Plugin.pm | 54 ++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index afd31414..a7c5d083 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1899,40 +1899,42 @@ sub activate_storage { . "directory '$path' does not exist or is unreachable\n"; } + if (!defined($scfg->{content})) { + return; + } + # TODO: mkdir is basically deprecated since 8.0, but we don't warn here until 8.4 or 9.0, as we # only got the replacement in 8.0, so no real replacement window, and its really noisy. - if (defined($scfg->{content})) { - # (opt-out) create content dirs and check validity - if ( - (!defined($scfg->{'create-subdirs'}) || $scfg->{'create-subdirs'}) - # FIXME The mkdir option is deprecated. Remove with PVE 9? - && (!defined($scfg->{mkdir}) || $scfg->{mkdir}) - ) { - for my $vtype (sort keys %$vtype_subdirs) { - # OpenVZMigrate uses backup (dump) dir - if ( - defined($scfg->{content}->{$vtype}) - || ($vtype eq 'backup' && defined($scfg->{content}->{'rootdir'})) - ) { - my $subdir = $class->get_subdir($scfg, $vtype); - mkpath $subdir if $subdir ne $path; - } + # (opt-out) create content dirs and check validity + if ( + (!defined($scfg->{'create-subdirs'}) || $scfg->{'create-subdirs'}) + # FIXME The mkdir option is deprecated. Remove with PVE 9? + && (!defined($scfg->{mkdir}) || $scfg->{mkdir}) + ) { + for my $vtype (sort keys %$vtype_subdirs) { + # OpenVZMigrate uses backup (dump) dir + if ( + defined($scfg->{content}->{$vtype}) + || ($vtype eq 'backup' && defined($scfg->{content}->{'rootdir'})) + ) { + my $subdir = $class->get_subdir($scfg, $vtype); + mkpath $subdir if $subdir ne $path; } } + } - # check that content dirs are pairwise inequal - my $resolved_subdirs = {}; - for my $vtype (sort keys $scfg->{content}->%*) { - my $subdir = $class->get_subdir($scfg, $vtype); - my $abs_subdir = abs_path($subdir); - next if !defined($abs_subdir); + # check that content dirs are pairwise inequal + my $resolved_subdirs = {}; + for my $vtype (sort keys $scfg->{content}->%*) { + my $subdir = $class->get_subdir($scfg, $vtype); + my $abs_subdir = abs_path($subdir); + next if !defined($abs_subdir); - die "storage '$storeid' uses directory $abs_subdir for multiple content types\n" - if defined($abs_subdir) && defined($resolved_subdirs->{$abs_subdir}); + die "storage '$storeid' uses directory $abs_subdir for multiple content types\n" + if defined($abs_subdir) && defined($resolved_subdirs->{$abs_subdir}); - $resolved_subdirs->{$abs_subdir} = 1; - } + $resolved_subdirs->{$abs_subdir} = 1; } } -- 2.47.3