[pve-devel] [PATCH storage v4 6/7] btrfs: remove foreach_subvol

Maximiliano Sandoval m.sandoval at proxmox.com
Wed Feb 19 12:17:39 CET 2025


This method is not used anymore.

Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
---
 src/PVE/Storage/BTRFSPlugin.pm | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/PVE/Storage/BTRFSPlugin.pm b/src/PVE/Storage/BTRFSPlugin.pm
index bd93cc0..c82d5f7 100644
--- a/src/PVE/Storage/BTRFSPlugin.pm
+++ b/src/PVE/Storage/BTRFSPlugin.pm
@@ -407,26 +407,15 @@ my sub path_is_subvolume : prototype($) {
 
 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_SNAPSHOT_REGEX, sub {
-	my ($volume, $name, $snapshot) = ($1, $2, $3);
-	return if !path_is_subvolume("$dir/$volume");
-	$code->($volume, $name, $snapshot);
-    })
-}
-
 # Calls `$code->($snapshot)` for each snapshot of the BTRFS subvolume.
 my sub foreach_snapshot_of_subvol : prototype($$) {
     my ($subvol, $code) = @_;
 
     my $basename = basename($subvol);
     my $dir = dirname($subvol);
-    foreach_subvol($dir, sub {
-	my ($volume, $name, $snapshot) = @_;
+    dir_glob_foreach($dir, $BTRFS_SNAPSHOT_REGEX, sub {
+	my ($volume, $name, $snapshot) = ($1, $2, $3);
+	return if !path_is_subvolume("$dir/$volume");
 	return if $name ne $basename;
 	return if !defined $snapshot;
 	$code->($snapshot);
-- 
2.39.5





More information about the pve-devel mailing list