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 9CF11941EC 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 830E5A6E8 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 B675A44EC5 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:43 +0100 Message-Id: <20230110125243.176153-3-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.228 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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 3/3] zfs: list zvol: limit recursion depth to 1 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 To be correct in all cases, it's still necessary to filter by "pool" in zfs_parse_zvol_list(), because $scfg->{pool} could be e.g. 'foo/vm-123-disk-0' which looks like an image name and would pass the other "should skip"-checks in zfs_parse_zvol_list(). No change in the result of zfs_list_zvol() is intended. Suggested-by: Fabian Grünbichler Signed-off-by: Fiona Ebner --- PVE/Storage/ZFSPoolPlugin.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index b971c7a..9fbd149 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -377,9 +377,12 @@ sub zfs_list_zvol { 'name,volsize,origin,type,refquota', '-t', 'volume,filesystem', - '-Hrp', + '-d1', + '-Hp', $scfg->{pool}, ); + # It's still required to have zfs_parse_zvol_list filter by pool, because -d1 lists + # $scfg->{pool} too and while unlikely, it could be named to be mistaken for a volume. my $zvols = zfs_parse_zvol_list($text, $scfg->{pool}); return {} if !$zvols; -- 2.30.2