From 2668a867197a8e9885f8a4af855edb362c1a05c4 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Fri, 5 Nov 2021 11:29:44 +0100 Subject: [PATCH] lvm thin: status: code cleanup Signed-off-by: Fabian Ebner --- PVE/Storage/LvmThinPlugin.pm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/PVE/Storage/LvmThinPlugin.pm b/PVE/Storage/LvmThinPlugin.pm index b0cf3d2..45360db 100644 --- a/PVE/Storage/LvmThinPlugin.pm +++ b/PVE/Storage/LvmThinPlugin.pm @@ -195,23 +195,15 @@ sub list_thinpools { sub status { my ($class, $storeid, $scfg, $cache) = @_; - my $lvname = "$scfg->{vgname}/$scfg->{thinpool}"; + my $lvs = $cache->{lvs} ||= PVE::Storage::LVMPlugin::lvm_list_volumes(); - $cache->{lvs} = PVE::Storage::LVMPlugin::lvm_list_volumes() if !$cache->{lvs}; - - my $lvs = $cache->{lvs}; - - return undef if !$lvs->{$scfg->{vgname}}; + return if !$lvs->{$scfg->{vgname}}; my $info = $lvs->{$scfg->{vgname}}->{$scfg->{thinpool}}; - return undef if !$info; + return if !$info || $info->{lv_type} ne 't' || !$info->{lv_size}; - return undef if $info->{lv_type} ne 't'; - - return ($info->{lv_size}, $info->{lv_size} - $info->{used}, $info->{used}, 1) if $info->{lv_size}; - - return undef; + return ($info->{lv_size}, $info->{lv_size} - $info->{used}, $info->{used}, 1); } sub activate_volume { -- 2.39.2