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 122AB75842 for ; Thu, 24 Jun 2021 10:46:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 006D7150B5 for ; Thu, 24 Jun 2021 10:46:08 +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 DB86C150AC for ; Thu, 24 Jun 2021 10:46:03 +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 A49C646789 for ; Thu, 24 Jun 2021 10:45:58 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Thu, 24 Jun 2021 10:45:55 +0200 Message-Id: <20210624084555.77018-1-w.bumiller@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.495 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 URI_NOVOWEL 0.5 URI hostname has long non-vowel sequence Subject: [pve-devel] [PATCH v2 storage] btrfs: check for btrfs in on_add_hook and activate 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: Thu, 24 Jun 2021 08:46:38 -0000 Signed-off-by: Wolfgang Bumiller --- Changes to v1: * Fabian's feedback: * removed on_add_hook since activate_storage is called anyway * moved btrfs check to after the DirPlugin checks PVE/Storage/BTRFSPlugin.pm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/BTRFSPlugin.pm b/PVE/Storage/BTRFSPlugin.pm index 133edc6..dc5894a 100644 --- a/PVE/Storage/BTRFSPlugin.pm +++ b/PVE/Storage/BTRFSPlugin.pm @@ -20,6 +20,7 @@ use constant { FS_NOCOW_FL => 0x00800000, FS_IOC_GETFLAGS => 0x40086602, FS_IOC_SETFLAGS => 0x80086601, + BTRFS_MAGIC => 0x9123683e, }; # Configuration (similar to DirPlugin) @@ -89,9 +90,30 @@ sub check_config { return PVE::Storage::DirPlugin::check_config($self, $sectionId, $config, $create, $skipSchemaCheck); } +my sub getfsmagic($) { + my ($path) = @_; + # The field type sizes in `struct statfs` are defined in a rather annoying way, and we only + # need the first field, which is a `long` for our supported platforms. + # Should be moved to pve-rs, so this can be the problem of the `libc` crate ;-) + # Just round up and extract what we need: + my $buf = pack('x160'); + if (0 != syscall(&PVE::Syscall::SYS_statfs, $path, $buf)) { + die "statfs on '$path' failed - $!\n"; + } + + return unpack('L!', $buf); +} + +my sub assert_btrfs($) { + my ($path) = @_; + die "'$path' is not a btrfs file system\n" + if getfsmagic($path) != BTRFS_MAGIC; +} + sub activate_storage { my ($class, $storeid, $scfg, $cache) = @_; - return PVE::Storage::DirPlugin::activate_storage($class, $storeid, $scfg, $cache); + PVE::Storage::DirPlugin::activate_storage($class, $storeid, $scfg, $cache); + assert_btrfs($scfg->{path}); } sub status { -- 2.30.2