From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 7 Jun 2017 04:20:07 +0000 (+0200)
Subject: PVE::Storage::volume_snapshot_list - remove $prefix parameter
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8b622c2dff6d10c1776b9603f68e18d85e2812e0;p=pve-storage.git

PVE::Storage::volume_snapshot_list - remove $prefix parameter

Always return the full list of snapshots. Users of this library can easily
filter with a simply 'grep' instead.
---

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index cfd7b2c..0b40416 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -264,13 +264,13 @@ sub volume_has_feature {
 }
 
 sub volume_snapshot_list {
-    my ($cfg, $volid, $prefix) = @_;
+    my ($cfg, $volid) = @_;
 
     my ($storeid, $volname) = parse_volume_id($volid, 1);
     if ($storeid) {
 	my $scfg = storage_config($cfg, $storeid);
 	my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
-	return $plugin->volume_snapshot_list($scfg, $storeid, $volname, $prefix);
+	return $plugin->volume_snapshot_list($scfg, $storeid, $volname);
     } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
 	die "send file/device '$volid' is not possible\n";
     } else {
diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 4df6608..6d94b64 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -825,7 +825,7 @@ sub status {
 }
 
 sub volume_snapshot_list {
-    my ($class, $scfg, $storeid, $volname, $prefix) = @_;
+    my ($class, $scfg, $storeid, $volname) = @_;
 
     # implement in subclass
     die "Volume_snapshot_list is not implemented for $class";
diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm
index 032bdf0..8658f0e 100644
--- a/PVE/Storage/ZFSPlugin.pm
+++ b/PVE/Storage/ZFSPlugin.pm
@@ -363,7 +363,7 @@ sub volume_has_feature {
 }
 
 sub volume_snapshot_list {
-    my ($class, $scfg, $storeid, $volname, $prefix) = @_;
+    my ($class, $scfg, $storeid, $volname) = @_;
     # return an empty array if dataset does not exist.
     die "Volume_snapshot_list is not implemented for ZFS over iSCSI.\n";
 }
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index bc9da23..c8415eb 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -495,7 +495,7 @@ sub volume_rollback_is_possible {
 }
 
 sub volume_snapshot_list {
-    my ($class, $scfg, $storeid, $volname, $prefix) = @_;
+    my ($class, $scfg, $storeid, $volname) = @_;
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
@@ -510,7 +510,7 @@ sub volume_snapshot_list {
     my $outfunc = sub {
 	my $line = shift;
 
-	if ($line =~ m/^\Q$zpath\E@(\Q$prefix\E.*)$/) {
+	if ($line =~ m/^\Q$zpath\E@(.*)$/) {
 	    push @$snaps, $1;
 	}
     };