From: Dietmar Maurer <dietmar@proxmox.com>
Date: Sat, 24 Jan 2015 13:30:10 +0000 (+0100)
Subject: move activate_storage into ZFSPoolPlugin
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0a3d992f72568791ddff9cf37639c3625f7e70e1;p=pve-storage.git

move activate_storage into ZFSPoolPlugin
---

diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm
index 30215d4..581ef6c 100644
--- a/PVE/Storage/ZFSPlugin.pm
+++ b/PVE/Storage/ZFSPlugin.pm
@@ -290,16 +290,6 @@ sub free_image {
     return undef;
 }
 
-sub activate_storage {
-    my ($class, $storeid, $scfg, $cache) = @_;
-    return 1;
-}
-
-sub deactivate_storage {
-    my ($class, $storeid, $scfg, $cache) = @_;
-    return 1;
-}
-
 sub volume_resize {
     my ($class, $scfg, $storeid, $volname, $size, $running) = @_;
 
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 40cd753..10da7f7 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -417,6 +417,16 @@ sub volume_snapshot_rollback {
     zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
 }
 
+sub activate_storage {
+    my ($class, $storeid, $scfg, $cache) = @_;
+    return 1;
+}
+
+sub deactivate_storage {
+    my ($class, $storeid, $scfg, $cache) = @_;
+    return 1;
+}
+
 sub activate_volume {
     my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
     return 1;