From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id D098A1FF16B for ; Tue, 29 Jul 2025 13:17:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 44E48EFAF; Tue, 29 Jul 2025 13:16:44 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 13:15:35 +0200 Message-ID: <20250729111557.136012-23-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729111557.136012-1-w.bumiller@proxmox.com> References: <20250729111557.136012-1-w.bumiller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753787750247 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.078 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 22/26] zfs: update 'path' method for new naming scheme 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Wolfgang Bumiller --- src/PVE/Storage/ZFSPoolPlugin.pm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm index 2cae090..83cb9fb 100644 --- a/src/PVE/Storage/ZFSPoolPlugin.pm +++ b/src/PVE/Storage/ZFSPoolPlugin.pm @@ -123,7 +123,15 @@ sub zfs_parse_zvol_list { return $list; } -my sub image_vtype_from_name : prototype($) { +my sub volname_is_subvol : prototype($) { + my ($volname) = @_; + return 1 if $volname =~ /^(?:base-)?subvol-ct-/; + return 1 if $volname =~ /^subvol-/; + return 1 if $volname =~ /^basevol-/; + return 0; +} + +my sub volume_type_from_name : prototype($) { my ($name) = @_; return 'ct-vol' if $name =~ /^(base-)?subvol(-ct)?-/; @@ -194,16 +202,15 @@ sub path { my $path = ''; my $mountpoint = $scfg->{mountpoint} // "/$scfg->{pool}"; - if ($vtype eq "images") { - if ($name =~ m/^subvol-/ || $name =~ m/^basevol-/) { - $path = "$mountpoint/$name"; - } else { - $path = "/dev/zvol/$scfg->{pool}/$name"; - } - $path .= "\@$snapname" if defined($snapname); + die "$vtype is not allowed in ZFSPool!" + if $vtype ne 'vm-vol' && $vtype ne 'ct-vol' && $vtype ne 'images'; + + if (volname_is_subvol($name)) { + $path = "$mountpoint/$name"; } else { - die "$vtype is not allowed in ZFSPool!"; + $path = "/dev/zvol/$scfg->{pool}/$name"; } + $path .= "\@$snapname" if defined($snapname); return ($path, $vmid, $vtype); } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel