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 AE66E941EE 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 97584A7A5 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 B8F7644EDB 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:42 +0100 Message-Id: <20230110125243.176153-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230110125243.176153-1-f.ebner@proxmox.com> References: <20230110125243.176153-1-f.ebner@proxmox.com> MIME-Version: 1.0 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 2/3] zfs: list zvol: skip different pools during parsing already 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 The 'pool' property in the result of zfs_parse_zvol_list() was not used for anything else. No functional change is intended. Signed-off-by: Fiona Ebner --- PVE/Storage/ZFSPoolPlugin.pm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index bce360f..b971c7a 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -58,7 +58,7 @@ sub options { # static zfs helper methods sub zfs_parse_zvol_list { - my ($text) = @_; + my ($text, $pool) = @_; my $list = (); @@ -73,12 +73,12 @@ sub zfs_parse_zvol_list { my @parts = split /\//, $dataset; next if scalar(@parts) < 2; # we need pool/name my $name = pop @parts; - my $pool = join('/', @parts); + my $parsed_pool = join('/', @parts); + next if $parsed_pool ne $pool; next unless $name =~ m!^(vm|base|subvol|basevol)-(\d+)-(\S+)$!; $zvol->{owner} = $2; - $zvol->{pool} = $pool; $zvol->{name} = $name; if ($type eq 'filesystem') { if ($refquota eq 'none') { @@ -380,14 +380,11 @@ sub zfs_list_zvol { '-Hrp', $scfg->{pool}, ); - my $zvols = zfs_parse_zvol_list($text); + my $zvols = zfs_parse_zvol_list($text, $scfg->{pool}); return {} if !$zvols; 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}; - my $name = $zvol->{name}; my $parent = $zvol->{origin}; if($zvol->{origin} && $zvol->{origin} =~ m/^$scfg->{pool}\/(\S+)$/){ -- 2.30.2