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 C062E1FF141 for ; Fri, 13 Feb 2026 11:28:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0743935BE5; Fri, 13 Feb 2026 11:28:54 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH storage] lvm plugin: encode locking requirement into the name of two helper functions Date: Fri, 13 Feb 2026 11:27:03 +0100 Message-ID: <20260213102816.17672-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: 1770978495829 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 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: JBZJKQXDY4BU2QJ7ABC5MCPQLK4JQEEU X-Message-ID-Hash: JBZJKQXDY4BU2QJ7ABC5MCPQLK4JQEEU 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: Makes it easier to verify and keep track of the locking, and to not forget taking the lock for future callers. Reported-by: Friedrich Weber Signed-off-by: Fiona Ebner --- src/PVE/Storage/LVMPlugin.pm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 32a8339..3a35e38 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -279,7 +279,7 @@ sub lvm_list_volumes { return $lvs; } -my sub free_lvm_volumes { +my sub free_lvm_volumes_locked { my ($class, $scfg, $storeid, $volnames) = @_; my $vg = $scfg->{vgname}; @@ -759,13 +759,14 @@ my sub alloc_snap_image { alloc_lvm_image($class, $storeid, $scfg, $vmid, $format, $volname, $size, $backing_snap); } -my sub free_snap_image { +my sub free_snap_image_locked { my ($class, $storeid, $scfg, $volname, $snap) = @_; my $snap_volname = get_snap_name($class, $volname, $snap); - return free_lvm_volumes($class, $scfg, $storeid, [$snap_volname]); + return free_lvm_volumes_locked($class, $scfg, $storeid, [$snap_volname]); } +# Must be called with the storage lock held. sub free_image { my ($class, $storeid, $scfg, $volname, $isBase, $format) = @_; @@ -790,7 +791,7 @@ sub free_image { } } - return free_lvm_volumes($class, $scfg, $storeid, $volnames); + return free_lvm_volumes_locked($class, $scfg, $storeid, $volnames); } my $check_tags = sub { @@ -1123,7 +1124,8 @@ my sub volume_snapshot_rollback_locked { die "can't rollback snapshot for '$format' volume\n" if $format ne 'qcow2'; - $cleanup_worker->$* = eval { free_snap_image($class, $storeid, $scfg, $volname, 'current'); }; + $cleanup_worker->$* = + eval { free_snap_image_locked($class, $storeid, $scfg, $volname, 'current'); }; die "error deleting snapshot $snap $@\n" if $@; eval { alloc_snap_image($class, $storeid, $scfg, $volname, $snap) }; @@ -1174,7 +1176,9 @@ sub volume_snapshot_delete { $storeid, $scfg->{shared}, undef, - sub { return free_snap_image($class, $storeid, $scfg, $volname, $snap); }, + sub { + return free_snap_image_locked($class, $storeid, $scfg, $volname, $snap); + }, ); }; die "error deleting snapshot $snap $@\n" if $@; @@ -1219,8 +1223,9 @@ sub volume_snapshot_delete { $scfg->{shared}, undef, sub { - my $cleanup_worker_sub = - eval { free_snap_image($class, $storeid, $scfg, $volname, $childsnap) }; + my $cleanup_worker_sub = eval { + free_snap_image_locked($class, $storeid, $scfg, $volname, $childsnap); + }; if ($@) { die "error delete old snapshot volume $childvolname: $@\n"; } @@ -1266,7 +1271,9 @@ sub volume_snapshot_delete { $storeid, $scfg->{shared}, undef, - sub { return free_snap_image($class, $storeid, $scfg, $volname, $snap); }, + sub { + return free_snap_image_locked($class, $storeid, $scfg, $volname, $snap); + }, ); }; die "error deleting old snapshot volume $snapvolname: $@\n" if $@; -- 2.47.3