From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DD5487C62B for ; Fri, 5 Nov 2021 11:30:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D511AA73E for ; Fri, 5 Nov 2021 11:29:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6C905A735 for ; Fri, 5 Nov 2021 11:29:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3D34545F02 for ; Fri, 5 Nov 2021 11:29:49 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 5 Nov 2021 11:29:44 +0100 Message-Id: <20211105102945.185988-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.232 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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] [PATCH storage 1/2] lvm thin: status: code cleanup 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: , X-List-Received-Date: Fri, 05 Nov 2021 10:30:19 -0000 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 4ba6f90..34e57b2 100644 --- a/PVE/Storage/LvmThinPlugin.pm +++ b/PVE/Storage/LvmThinPlugin.pm @@ -194,23 +194,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.30.2