From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 553831FF15C for ; Wed, 19 Feb 2025 12:18:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ABA1D1ECAB; Wed, 19 Feb 2025 12:17:44 +0100 (CET) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Wed, 19 Feb 2025 12:17:38 +0100 Message-Id: <20250219111740.200819-5-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250219111740.200819-1-m.sandoval@proxmox.com> References: <20250219111740.200819-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.146 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 URI_NOVOWEL 0.5 URI hostname has long non-vowel sequence Subject: [pve-devel] [PATCH storage v4 5/7] btrfs: rename volume regex 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The regex only lists snapshots. Signed-off-by: Maximiliano Sandoval --- src/PVE/Storage/BTRFSPlugin.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PVE/Storage/BTRFSPlugin.pm b/src/PVE/Storage/BTRFSPlugin.pm index 9fc51ef..bd93cc0 100644 --- a/src/PVE/Storage/BTRFSPlugin.pm +++ b/src/PVE/Storage/BTRFSPlugin.pm @@ -405,14 +405,14 @@ my sub path_is_subvolume : prototype($) { return S_ISDIR($mode) && $ino == BTRFS_FIRST_FREE_OBJECTID; } -my $BTRFS_VOL_REGEX = qr/((?:vm|base|subvol)-\d+-disk-\d+(?:\.subvol)?)(?:\@(\S+))$/; +my $BTRFS_SNAPSHOT_REGEX = qr/((?:vm|base|subvol)-\d+-disk-\d+(?:\.subvol)?)(?:\@(\S+))$/; # Calls `$code->($volume, $name, $snapshot)` for each subvol in a directory matching our volume # regex. my sub foreach_subvol : prototype($$) { my ($dir, $code) = @_; - dir_glob_foreach($dir, $BTRFS_VOL_REGEX, sub { + dir_glob_foreach($dir, $BTRFS_SNAPSHOT_REGEX, sub { my ($volume, $name, $snapshot) = ($1, $2, $3); return if !path_is_subvolume("$dir/$volume"); $code->($volume, $name, $snapshot); @@ -869,7 +869,7 @@ sub volume_import { $dh->rewind; while (defined(my $entry = $dh->read)) { next if $entry eq '.' || $entry eq '..'; - next if $entry !~ /^$BTRFS_VOL_REGEX$/; + next if $entry !~ /^$BTRFS_SNAPSHOT_REGEX$/; my ($cur_diskname, $cur_snapshot) = ($1, $2); die "send stream included a non-snapshot subvolume\n" -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel