From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7F0611FF145 for ; Thu, 05 Feb 2026 15:37:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1CDDE13B9E; Thu, 5 Feb 2026 15:38:01 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: applied: [PATCH storage] lvm{,thin} plugin: don't call parse_volume_id() from PVE::Storage module Date: Thu, 5 Feb 2026 15:36:53 +0100 Message-ID: <20260205143723.133344-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1770302169076 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: MVVM2VYGLNKRL7TNYMRJOWDDV7MDZVXJ X-Message-ID-Hash: MVVM2VYGLNKRL7TNYMRJOWDDV7MDZVXJ X-MailFrom: f.ebner@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: Including PVE::Storage would mean introducing a cyclic dependency. The PVE::Storage::parse_volume_id() function is just a thin wrapper around PVE::Storage::Plugin::parse_volume_id(), so use that function directly. Signed-off-by: Fiona Ebner --- src/PVE/Storage/LVMPlugin.pm | 5 +++-- src/PVE/Storage/LvmThinPlugin.pm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 102cf22..db34123 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -480,7 +480,7 @@ sub on_add_hook { my ($class, $storeid, $scfg, %param) = @_; if (my $base = $scfg->{base}) { - my ($baseid, $volname) = PVE::Storage::parse_volume_id($base); + my ($baseid, $volname) = PVE::Storage::Plugin::parse_volume_id($base); my $cfg = PVE::Storage::config(); my $basecfg = PVE::Storage::storage_config($cfg, $baseid, 1); @@ -785,7 +785,8 @@ sub free_image { my $snap = $snapshots->{$snapid}; next if $snapid eq 'current'; next if !$snap->{volid}; - my ($snap_storeid, $snap_volname) = PVE::Storage::parse_volume_id($snap->{volid}); + my ($snap_storeid, $snap_volname) = + PVE::Storage::Plugin::parse_volume_id($snap->{volid}); push @$volnames, $snap_volname; } } diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm index 2797d9e..99874b5 100644 --- a/src/PVE/Storage/LvmThinPlugin.pm +++ b/src/PVE/Storage/LvmThinPlugin.pm @@ -477,7 +477,7 @@ sub volume_import { $with_snapshots, $allow_rename, ); - ($storeid, my $newname) = PVE::Storage::parse_volume_id($newvolid); + ($storeid, my $newname) = PVE::Storage::Plugin::parse_volume_id($newvolid); $volname = $class->create_base($storeid, $scfg, $newname); } -- 2.47.3