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 EF8281FF13E for ; Wed, 01 Jul 2026 16:14:29 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 89873213C8; Wed, 01 Jul 2026 16:14:14 +0200 (CEST) From: =?UTF-8?q?Michael=20K=C3=B6ppl?= To: pve-devel@lists.proxmox.com Subject: [PATCH container v10 02/10] destroy_lxc, delete_mp_volume: rename $volume to $volid Date: Wed, 1 Jul 2026 16:13:31 +0200 Message-ID: <20260701141339.181276-3-m.koeppl@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260701141339.181276-1-m.koeppl@proxmox.com> References: <20260701141339.181276-1-m.koeppl@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1782915215493 X-SPAM-LEVEL: Spam detection results: 0 DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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: 7PXXOW7PZIOKF2Y2UGXSOCLMC6JJS5AR X-Message-ID-Hash: 7PXXOW7PZIOKF2Y2UGXSOCLMC6JJS5AR X-MailFrom: m.koeppl@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: $volid states more clearly that it's a volume ID, avoiding confusion about the values these variables hold. No functional change intended. Reviewed-by: Fiona Ebner Signed-off-by: Michael Köppl --- src/PVE/LXC.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index aa5ff315..e76da29f 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1007,16 +1007,16 @@ sub get_primary_ips { } sub delete_mountpoint_volume { - my ($storage_cfg, $vmid, $volume) = @_; + my ($storage_cfg, $vmid, $volid) = @_; - return if PVE::LXC::Config->classify_mountpoint($volume) ne 'volume'; + return if PVE::LXC::Config->classify_mountpoint($volid) ne 'volume'; - my ($vtype, $name, $owner) = PVE::Storage::parse_volname($storage_cfg, $volume); + my ($vtype, $name, $owner) = PVE::Storage::parse_volname($storage_cfg, $volid); if ($vmid == $owner) { - PVE::Storage::vdisk_free($storage_cfg, $volume); + PVE::Storage::vdisk_free($storage_cfg, $volid); } else { - warn "ignore deletion of '$volume', CT $vmid isn't the owner!\n"; + warn "ignore deletion of '$volid', CT $vmid isn't the owner!\n"; } } @@ -1027,13 +1027,13 @@ sub destroy_lxc_container { my $remove_volume = sub { my ($ms, $mountpoint) = @_; - my $volume = $mountpoint->{volume}; + my $volid = $mountpoint->{volume}; - return if $volids->{$volume}; - $volids->{$volume} = 1; + return if $volids->{$volid}; + $volids->{$volid} = 1; - eval { delete_mountpoint_volume($storage_cfg, $vmid, $volume); }; - PVE::RESTEnvironment::log_warn("failed to delete mountpoint volume $volume: $@") if $@; + eval { delete_mountpoint_volume($storage_cfg, $vmid, $volid); }; + PVE::RESTEnvironment::log_warn("failed to delete mountpoint volume $volid: $@") if $@; }; PVE::LXC::Config->foreach_volume_full($conf, { include_unused => 1 }, $remove_volume); -- 2.47.3