diff --git a/PVE/Storage.pm b/PVE/Storage.pm index c06983d..14b8289 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, $ip) = @_; + my ($cfg, $volid, $prefix) = @_; 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, $ip); + return $plugin->volume_snapshot_list($scfg, $storeid, $volname, $prefix); } 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 0a5e904..b10e2d9 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, $ip) = @_; + my ($class, $scfg, $storeid, $volname, $prefix) = @_; # 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 500cb09..032bdf0 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, $ip) = @_; + my ($class, $scfg, $storeid, $volname, $prefix) = @_; # 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 265b557..0636ee1 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, $ip) = @_; + my ($class, $scfg, $storeid, $volname, $prefix) = @_; my ($vtype, $name, $vmid) = $class->parse_volname($volname); @@ -507,11 +507,6 @@ sub volume_snapshot_list { my $cmd = ['zfs', 'list', '-r', '-H', '-S', 'name', '-t', 'snap', '-o', 'name', $zpath]; - if ($ip) { - $ip = "[$ip]" if Net::IP::ip_is_ipv6($ip); - unshift @$cmd, 'ssh', '-o', ' BatchMode=yes', "root\@${ip}", '--'; - } - my $outfunc = sub { my $line = shift;