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 3EBD76B38A for ; Tue, 26 Jan 2021 12:45:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 35FC015979 for ; Tue, 26 Jan 2021 12:45:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 499381594E for ; Tue, 26 Jan 2021 12:45:35 +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 0D3774610E for ; Tue, 26 Jan 2021 12:45:35 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 26 Jan 2021 12:45:18 +0100 Message-Id: <20210126114530.8753-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210126114530.8753-1-f.ebner@proxmox.com> References: <20210126114530.8753-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [diskmanage.pm] Subject: [pve-devel] [PATCH storage 02/14] Diskmanage: replace closure with direct hash access 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: Tue, 26 Jan 2021 11:45:36 -0000 Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 116a99a..f28e007 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -480,11 +480,6 @@ sub get_disks { $mounted->{abs_path($mount->[0])} = $mount->[1]; }; - my $dev_is_mounted = sub { - my ($dev) = @_; - return $mounted->{$dev}; - }; - my $parttype_map = get_parttype_info(); my $journalhash = get_ceph_journals($parttype_map); @@ -567,7 +562,7 @@ sub get_disks { $used = 'LVM' if $lvmhash->{$devpath}; - $used = 'mounted' if &$dev_is_mounted($devpath); + $used = 'mounted' if $mounted->{$devpath}; $used = 'ZFS' if $zfshash->{$devpath}; @@ -621,7 +616,7 @@ sub get_disks { $found_partitions = 1; - if (my $mp = &$dev_is_mounted("$partpath/$part")) { + if (my $mp = $mounted->{"$partpath/$part"}) { $found_mountpoints = 1; if ($mp =~ m|^/var/lib/ceph/osd/ceph-(\d+)$|) { $osdid = $1; -- 2.20.1