From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH storage] plugins: better document how volname_for_format() validates the name
Date: Mon, 5 Oct 2026 13:04:43 +0200 [thread overview]
Message-ID: <20261005110650.91260-1-f.ebner@proxmox.com> (raw)
In particular, there is a requirement for get_parsed_format() to
return a format only if it validated the name. Mention it explicitly.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
src/PVE/Storage/Plugin.pm | 5 +++--
src/PVE/Storage/ZFSPoolPlugin.pm | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 8318a68..e2025f8 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -851,7 +851,7 @@ sub parse_volname {
=head3 get_parsed_format
Return the disk format encoded in the given volume name, or C<undef> if the name does not spell one
-out.
+out. If a format is returned, the name must have been validated.
This is an extension point for plugins whose volume names encode the format differently. ZFS
derives it from the name prefix via C<parse_volname>, while LVM and RBD take it from a known file
@@ -866,7 +866,7 @@ sub get_parsed_format {
return undef if $name !~ m/\.[^.]+$/; # no extension, so no format is spelled out
- return (parse_name_dir($name))[1];
+ return (parse_name_dir($name))[1]; # dies for invalid volume file names
}
sub is_valid_format {
@@ -904,6 +904,7 @@ sub volname_for_format {
my $parsed_volname_fmt = $class->get_parsed_format($name);
+ # Note that get_parsed_format() validates the name if it has a format extension.
return $name if defined($parsed_volname_fmt) && $parsed_volname_fmt eq $fmt;
my $suggestion = $class->volname_with_format($name, $fmt);
diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm
index 61c49d9..e7cd1de 100644
--- a/src/PVE/Storage/ZFSPoolPlugin.pm
+++ b/src/PVE/Storage/ZFSPoolPlugin.pm
@@ -159,7 +159,7 @@ sub parse_volname {
sub get_parsed_format {
my ($class, $name) = @_;
- return ($class->parse_volname($name))[6];
+ return ($class->parse_volname($name))[6]; # dies for invalid volume names
}
# ZFS volume names always encode their format in the name prefix (vm- for raw
@@ -170,6 +170,7 @@ sub volname_for_format {
die "unsupported format '$fmt'\n" if !($class->is_valid_format($fmt));
+ # Note that get_parsed_format() validates the name.
my $name_fmt = $class->get_parsed_format($name);
return $name if $name_fmt eq $fmt;
--
2.47.3
next reply other threads:[~2026-10-05 11:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-05 11:04 Fiona Ebner [this message]
2026-10-07 12:51 ` [PATCH storage] plugins: better document how volname_for_format() validates the name Elias Huhsovitz
2026-10-07 13:12 ` Fiona Ebner
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=20261005110650.91260-1-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