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 850A9767B0 for ; Fri, 23 Apr 2021 12:15:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7BB822766E 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 5827F2763E 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 3C0EE4642E 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:54 +0200 Message-Id: <20210423101501.27300-5-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 04/11] diskmanage: add has_holder method 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:46 -0000 Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 70677ea..07bcef2 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -848,6 +848,30 @@ sub append_partition { return $partition; } +# Check if a disk or any of its partitions has a holder. +# Can also be called with a partition. +# Expected to be called with a result of verify_blockdev_path(). +sub has_holder { + my ($devpath) = @_; + + my $sysdir = "/sys/class/block/"; + + my $dev = $devpath; + $dev =~ s|^/dev/||; + + return $devpath if !dir_is_empty("${sysdir}/${dev}/holders"); + + my $found; + + dir_glob_foreach("/sys/block/${dev}", "${dev}.+", sub { + my ($part) = @_; + + $found = "/dev/${part}" if !dir_is_empty("${sysdir}/${part}/holders"); + }); + + return $found; +} + # Basic check if a disk or any of its partitions is mounted. # Can also be called with a partition. # Expected to be called with a result of verify_blockdev_path(). -- 2.20.1