[pve-devel] [PATCH pve-storage] fix #3555: BTRFSPlugin: call free_image correctly

[Fabian Ebner]

Am 30.07.21 um 13:04 schrieb Hannes Laimer:
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
>   PVE/Storage/BTRFSPlugin.pm | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/PVE/Storage/BTRFSPlugin.pm b/PVE/Storage/BTRFSPlugin.pm
> index 4596b30..411cab9 100644
> --- a/PVE/Storage/BTRFSPlugin.pm
> +++ b/PVE/Storage/BTRFSPlugin.pm
> @@ -410,7 +410,7 @@ sub free_image {
>   	$class->parse_volname($volname);
>   
>       if ($format ne 'subvol' && $format ne 'raw') {
> -	return PVE::Storage::DirPlugin::free_image(@_);
> +	return PVE::Storage::DirPlugin->free_image($storeid, $scfg, $volname, $isBase, $_format);

Sorry, I had missed this in our brief off-list discussion, but this 
actually behaves differently from the previously intended semantics:

When free_image (the one that's called here) calls a method, now the 
method from DirPlugin is used rather than the one from BTRFSPlugin. It 
/might/ be fine in this case, but not sure. To be on the safe (and 
future-proof) side, we should go with one of the alternatives Thomas 
suggested.

>       }
>   
>       my $path = $class->filesystem_path($scfg, $volname);
>