From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 164F91FF183 for ; Wed, 30 Jul 2025 11:30:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A5C1337D19; Wed, 30 Jul 2025 11:32:19 +0200 (CEST) Date: Wed, 30 Jul 2025 11:31:42 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20250729111557.136012-1-w.bumiller@proxmox.com> <20250729111557.136012-23-w.bumiller@proxmox.com> In-Reply-To: <20250729111557.136012-23-w.bumiller@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1753867801.9jedypvr1r.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753867894964 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [zfspoolplugin.pm, proxmox.com] Subject: Re: [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" On July 29, 2025 1:15 pm, Wolfgang Bumiller wrote: > 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'; should use the volume_is_vdisk (currently is_volume_type) helper > + > + 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 > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel