public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 02/11] diskmanage: factor out mounted_blockdevs helper
Date: Fri, 23 Apr 2021 12:14:52 +0200	[thread overview]
Message-ID: <20210423101501.27300-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210423101501.27300-1-f.ebner@proxmox.com>

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 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





  parent reply	other threads:[~2021-04-23 10:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-23 10:14 [pve-devel] [PATCH-SERIES storage/widget-toolkit/manager] Add wipe disk api call and button Fabian Ebner
2021-04-23 10:14 ` [pve-devel] [PATCH storage 01/11] diskmanage: add wipe_blockdev method Fabian Ebner
2021-04-23 10:14 ` Fabian Ebner [this message]
2021-04-23 10:14 ` [pve-devel] [PATCH storage 03/11] diskmanage: add is_mounted method Fabian Ebner
2021-04-23 10:14 ` [pve-devel] [PATCH storage 04/11] diskmanage: add has_holder method Fabian Ebner
2021-04-23 10:14 ` [pve-devel] [PATCH storage 05/11] api: add wipedisk call Fabian Ebner
2021-04-23 10:14 ` [pve-devel] [PATCH widget-toolkit 06/11] disk list: fix minor usage renderer issue Fabian Ebner
2021-05-07 15:59   ` [pve-devel] applied: " Thomas Lamprecht
2021-04-23 10:14 ` [pve-devel] [PATCH widget-toolkit 07/11] disk list: factor out renderers for type and usage Fabian Ebner
2021-05-07 15:59   ` [pve-devel] applied: " Thomas Lamprecht
2021-04-23 10:14 ` [pve-devel] [PATCH widget-toolkit 08/11] disk list: move title bar initialization to initComponent Fabian Ebner
2021-04-23 10:14 ` [pve-devel] [PATCH widget-toolkit 09/11] disk list: add wipe disk button Fabian Ebner
2021-04-23 10:15 ` [pve-devel] [PATCH manager 10/11] ui: add task description for wipe disk Fabian Ebner
2021-04-23 10:15 ` [pve-devel] [PATCH manager 11/11] ui: disk list: enable wipe disk button Fabian Ebner
2021-06-02 12:17 ` [pve-devel] applied-partially: [PATCH-SERIES storage/widget-toolkit/manager] Add wipe disk api call and button Thomas Lamprecht
2021-06-02 14:43 ` [pve-devel] applied-series: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210423101501.27300-3-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal