From 281f958706ca5426f57241f9a4c01419321d61fe Mon Sep 17 00:00:00 2001
From: Phillip Schichtel <phillip.public@schich.tel>
Date: Thu, 12 Nov 2015 20:00:37 +0100
Subject: [PATCH] Fixed ZFS over iSCSI snapshot rollback

I converted several zfs_request($class, ...) calls to $class->zfs_request(...) calls in ZFSPoolPlugin.pm and removed a superfluous $class parameter in ZFSPlugin.pm.

Fixes #816

Signed-off-by: Phillip Schichtel <phillip.public@schich.tel>
---
 PVE/Storage/ZFSPlugin.pm     | 2 +-
 PVE/Storage/ZFSPoolPlugin.pm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm
index 00f727e..5074ba4 100644
--- a/PVE/Storage/ZFSPlugin.pm
+++ b/PVE/Storage/ZFSPlugin.pm
@@ -323,7 +323,7 @@ sub volume_snapshot_rollback {
 
     $class->zfs_delete_lu($scfg, $volname);
 
-    $class->zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
+    $class->zfs_request($scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
 
     $class->zfs_import_lu($scfg, $volname);
 
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index bf8dca0..0c1d8d9 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -404,7 +404,7 @@ sub zfs_get_latest_snapshot {
 
     # abort rollback if snapshot is not the latest
     my @params = ('-t', 'snapshot', '-o', 'name', '-s', 'creation');
-    my $text = zfs_request($class, $scfg, undef, 'list', @params);
+    my $text = $class->zfs_request($scfg, undef, 'list', @params);
     my @snapshots = split(/\n/, $text);
 
     my $recentsnap;
@@ -468,7 +468,7 @@ sub volume_snapshot_delete {
 sub volume_snapshot_rollback {
     my ($class, $scfg, $storeid, $volname, $snap) = @_;
 
-    zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
+    $class->zfs_request($scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
 }
 
 sub volume_rollback_is_possible {
@@ -487,7 +487,7 @@ sub activate_storage {
 
     my @param = ('-o', 'name', '-H');
 
-    my $text = zfs_request($class, $scfg, undef, 'zpool_list', @param);
+    my $text = $class->zfs_request($scfg, undef, 'zpool_list', @param);
 
     # Note: $scfg->{pool} can include dataset <pool>/<dataset>
     my $pool = $scfg->{pool};