From 6c315e45872bfdec27efa5e7b67222ff64d004af Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Wed, 8 Sep 2021 13:26:50 +0200 Subject: [PATCH] btrfs: avoid undef warnings with format 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 --- 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.39.2