yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: fix handling of non-images volumes

Browse Source 
previously, only 'images' returned a format, now other volume types do too, so
differentiate where needed.

reported on the forum: https://forum.proxmox.com/threads/158888/

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2024-12-11 14:48:36 +01:00
committed by Fiona Ebner
parent c0304618f5
commit 652154c0b0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/PVE/Storage/BTRFSPlugin.pm
View File

@ -196,13 +196,13 @@ sub filesystem_path {
$path .= "/$vmid" if $vtype eq 'images'; $path .= "/$vmid" if $vtype eq 'images';
if (defined($format) && $format eq 'raw') { if ($vtype eq 'images' && defined($format) && $format eq 'raw') {
my $dir = raw_name_to_dir($name); my $dir = raw_name_to_dir($name);
if ($snapname) { if ($snapname) {
$dir .= "\@$snapname"; $dir .= "\@$snapname";
} }
$path .= "/$dir/disk.raw"; $path .= "/$dir/disk.raw";
} elsif (defined($format) && $format eq 'subvol') { } elsif ($vtype eq 'images' && defined($format) && $format eq 'subvol') {
$path .= "/$name"; $path .= "/$name";
if ($snapname) { if ($snapname) {
$path .= "\@$snapname"; $path .= "\@$snapname";
@ -422,10 +422,10 @@ my sub foreach_subvol : prototype($$) {
sub free_image { sub free_image {
my ($class, $storeid, $scfg, $volname, $isBase, $_format) = @_; my ($class, $storeid, $scfg, $volname, $isBase, $_format) = @_;
my (undef, undef, $vmid, undef, undef, undef, $format) = my ($vtype, undef, $vmid, undef, undef, undef, $format) =
$class->parse_volname($volname); $class->parse_volname($volname);
if (!defined($format) || ($format ne 'subvol' && $format ne 'raw')) { if (!defined($format) || $vtype ne 'images' || ($format ne 'subvol' && $format ne 'raw')) {
return $class->SUPER::free_image($storeid, $scfg, $volname, $isBase, $_format); return $class->SUPER::free_image($storeid, $scfg, $volname, $isBase, $_format);
} }