From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9B42F941EB for ; Tue, 10 Jan 2023 13:52:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7B3CAA6E7 for ; Tue, 10 Jan 2023 13:52:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 10 Jan 2023 13:52:46 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A8C9D44ED4 for ; Tue, 10 Jan 2023 13:52:46 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 10 Jan 2023 13:52:41 +0100 Message-Id: <20230110125243.176153-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [zfspoolplugin.pm] Subject: [pve-devel] [PATCH storage 1/3] zfs: list zvol: return empty hash rather than undef X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2023 12:52:47 -0000 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 Signed-off-by: Fiona Ebner --- 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