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 C78C7766C3 for ; Fri, 23 Apr 2021 12:15:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7C93D2766F for ; Fri, 23 Apr 2021 12:15:16 +0200 (CEST) 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 588382763F for ; Fri, 23 Apr 2021 12:15:15 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 190D0461D7 for ; Fri, 23 Apr 2021 12:15:05 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 23 Apr 2021 12:14:52 +0200 Message-Id: <20210423101501.27300-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210423101501.27300-1-f.ebner@proxmox.com> References: <20210423101501.27300-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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 02/11] diskmanage: factor out mounted_blockdevs helper 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, 23 Apr 2021 10:15:16 -0000 Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 612d976..c188d83 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -481,10 +481,7 @@ my sub is_ssdlike { return $type eq 'ssd' || $type eq 'nvme'; } -sub get_disks { - my ($disks, $nosmart, $include_partitions) = @_; - my $disklist = {}; - +sub mounted_blockdevs { my $mounted = {}; my $mounts = PVE::ProcFSTools::parse_proc_mounts(); @@ -494,6 +491,15 @@ sub get_disks { $mounted->{abs_path($mount->[0])} = $mount->[1]; }; + return $mounted; +} + +sub get_disks { + my ($disks, $nosmart, $include_partitions) = @_; + my $disklist = {}; + + my $mounted = mounted_blockdevs(); + my $lsblk_info = get_lsblk_info(); my $journalhash = get_ceph_journals($lsblk_info); -- 2.20.1