From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 1/2] btrfs: avoid undef warnings with format
Date: Wed, 8 Sep 2021 13:26:50 +0200 [thread overview]
Message-ID: <20210908112651.126237-1-f.ebner@proxmox.com> (raw)
which is only set by parse_volname when the volume is a VM or
container image, but not for other content types.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/Storage/BTRFSPlugin.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/PVE/Storage/BTRFSPlugin.pm b/PVE/Storage/BTRFSPlugin.pm
index fe42082..a1e5b98 100644
--- a/PVE/Storage/BTRFSPlugin.pm
+++ b/PVE/Storage/BTRFSPlugin.pm
@@ -180,13 +180,13 @@ sub filesystem_path {
$path .= "/$vmid" if $vtype eq 'images';
- if ($format eq 'raw') {
+ if (defined($format) && $format eq 'raw') {
my $dir = raw_name_to_dir($name);
if ($snapname) {
$dir .= "\@$snapname";
}
$path .= "/$dir/disk.raw";
- } elsif ($format eq 'subvol') {
+ } elsif (defined($format) && $format eq 'subvol') {
$path .= "/$name";
if ($snapname) {
$path .= "\@$snapname";
@@ -409,7 +409,7 @@ sub free_image {
my (undef, undef, $vmid, undef, undef, undef, $format) =
$class->parse_volname($volname);
- if ($format ne 'subvol' && $format ne 'raw') {
+ if (!defined($format) || ($format ne 'subvol' && $format ne 'raw')) {
return PVE::Storage::DirPlugin->free_image($storeid, $scfg, $volname, $isBase, $_format);
}
@@ -465,7 +465,7 @@ sub volume_size_info {
my $format = ($class->parse_volname($volname))[6];
- if ($format eq 'subvol') {
+ if (defined($format) && $format eq 'subvol') {
my $ctime = (stat($path))[10];
my ($used, $size) = (0, 0);
#my ($used, $size) = btrfs_subvol_quota($class, $path); # uses wantarray
--
2.30.2
next reply other threads:[~2021-09-08 11:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 11:26 Fabian Ebner [this message]
2021-09-08 11:26 ` [pve-devel] [PATCH storage 2/2] btrfs: style: add missing semicolon Fabian Ebner
2021-09-08 12:28 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-08 12:27 ` [pve-devel] applied: [PATCH storage 1/2] btrfs: avoid undef warnings with format Thomas Lamprecht
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=20210908112651.126237-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