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 550541FF2C8 for ; Wed, 17 Jul 2024 11:41:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 261BA38274; Wed, 17 Jul 2024 11:41:34 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Wed, 17 Jul 2024 11:40:09 +0200 Message-Id: <20240717094034.124857-12-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717094034.124857-1-m.carrara@proxmox.com> References: <20240717094034.124857-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 Subject: [pve-devel] [RFC pve-storage 11/36] plugin: lvmthin: replace usages of deprecated LVM helpers with new ones X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Max Carrara --- src/PVE/Storage/LvmThinPlugin.pm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm index 4b23623..480cc78 100644 --- a/src/PVE/Storage/LvmThinPlugin.pm +++ b/src/PVE/Storage/LvmThinPlugin.pm @@ -6,6 +6,7 @@ use warnings; use IO::File; use PVE::Tools qw(run_command trim); +use PVE::Storage::Common::LVM qw(lvm_vgs lvm_list_volumes); use PVE::Storage::Plugin; use PVE::Storage::LVMPlugin; use PVE::JSONSchema qw(get_standard_option); @@ -89,7 +90,7 @@ sub alloc_image { die "illegal name '$name' - should be 'vm-$vmid-*'\n" if $name && $name !~ m/^vm-$vmid-/; - my $vgs = PVE::Storage::LVMPlugin::lvm_vgs(); + my $vgs = lvm_vgs(); my $vg = $scfg->{vgname}; @@ -111,7 +112,7 @@ sub free_image { my $vg = $scfg->{vgname}; - my $lvs = PVE::Storage::LVMPlugin::lvm_list_volumes($vg); + my $lvs = lvm_list_volumes($vg); if (my $dat = $lvs->{$scfg->{vgname}}) { @@ -137,7 +138,7 @@ sub list_images { my $vgname = $scfg->{vgname}; - $cache->{lvs} = PVE::Storage::LVMPlugin::lvm_list_volumes() if !$cache->{lvs}; + $cache->{lvs} = lvm_list_volumes() if !$cache->{lvs}; my $res = []; @@ -176,7 +177,7 @@ sub list_images { sub list_thinpools { my ($vg) = @_; - my $lvs = PVE::Storage::LVMPlugin::lvm_list_volumes($vg); + my $lvs = lvm_list_volumes($vg); my $thinpools = []; foreach my $vg (keys %$lvs) { @@ -195,7 +196,7 @@ sub list_thinpools { sub status { my ($class, $storeid, $scfg, $cache) = @_; - my $lvs = $cache->{lvs} ||= PVE::Storage::LVMPlugin::lvm_list_volumes(); + my $lvs = $cache->{lvs} ||= lvm_list_volumes(); return if !$lvs->{$scfg->{vgname}}; @@ -214,7 +215,7 @@ sub status { my $activate_lv = sub { my ($vg, $lv, $cache) = @_; - my $lvs = $cache->{lvs} ||= PVE::Storage::LVMPlugin::lvm_list_volumes(); + my $lvs = $cache->{lvs} ||= lvm_list_volumes(); die "no such logical volume $vg/$lv\n" if !$lvs->{$vg} || !$lvs->{$vg}->{$lv}; @@ -295,7 +296,7 @@ sub create_base { die "create_base not possible with base image\n" if $isBase; my $vg = $scfg->{vgname}; - my $lvs = PVE::Storage::LVMPlugin::lvm_list_volumes($vg); + my $lvs = lvm_list_volumes($vg); if (my $dat = $lvs->{$vg}) { # to avoid confusion, reject if we find volume snapshots @@ -404,7 +405,7 @@ sub volume_import { } else { my $tempname; my $vg = $scfg->{vgname}; - my $lvs = PVE::Storage::LVMPlugin::lvm_list_volumes($vg); + my $lvs = lvm_list_volumes($vg); if ($lvs->{$vg}->{$volname}) { die "volume $vg/$volname already exists\n" if !$allow_rename; warn "volume $vg/$volname already exists - importing with a different name\n"; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel