[pve-devel] [RFC pve-storage 11/36] plugin: lvmthin: replace usages of deprecated LVM helpers with new ones

[Max Carrara]

Signed-off-by: Max Carrara <m.carrara at proxmox.com>
---
 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