[pve-devel] [PATCH storage 1/3] zfs: list zvol: return empty hash rather than undef

[Fiona Ebner]

Avoids the need for the fallback for the (only existing) caller.

Note that the old my $list = (); is a rather intransparent way of
assigning undef.

Suggested-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---
 PVE/Storage/ZFSPoolPlugin.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index f829b86..bce360f 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -254,7 +254,7 @@ sub free_image {
 sub list_images {
     my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
 
-    my $zfs_list = $class->zfs_list_zvol($scfg) // {};
+    my $zfs_list = $class->zfs_list_zvol($scfg);
 
     my $res = [];
 
@@ -381,9 +381,9 @@ sub zfs_list_zvol {
 	$scfg->{pool},
     );
     my $zvols = zfs_parse_zvol_list($text);
-    return undef if !$zvols;
+    return {} if !$zvols;
 
-    my $list = ();
+    my $list = {};
     foreach my $zvol (@$zvols) {
 	# The "pool" in $scfg is not the same as ZFS pool, so it's necessary to filter here.
 	next if $scfg->{pool} ne $zvol->{pool};
-- 
2.30.2