From 6555c64363239f32b3af52f814359cf4dbc34a43 Mon Sep 17 00:00:00 2001
From: luxflow <luxflow@live.com>
Date: Fri, 26 Aug 2016 20:56:09 +0900
Subject: [PATCH] Fix Zvolume to appear in filesystem

---
 debian/changelog                    |  1 +
 usr/share/omvzfs/OMVStorageZvol.php | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61a02b4..79293b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openmediavault-zfs (3.0.2) stable; urgency=low
 
   * Porting to OMV 3.0.26
   * Fix filesystem to show all dataset
+  * Fix Zvolume to appear in filesystem 
 
  -- OpenMediaVault Plugin Developers <plugins@omv-extras.org>  Fri, 26 Aug 2016 10:49:05 +0900
 
diff --git a/usr/share/omvzfs/OMVStorageZvol.php b/usr/share/omvzfs/OMVStorageZvol.php
index 6fd805e..7b69e8e 100644
--- a/usr/share/omvzfs/OMVStorageZvol.php
+++ b/usr/share/omvzfs/OMVStorageZvol.php
@@ -1,7 +1,4 @@
 <?php
-
-use OMV\System;
-use OMV\System\Filesystem\Backend\Manager;
 require_once("/usr/share/omvzfs/Utils.php");
 require_once("/usr/share/omvzfs/Dataset.php");
 require_once("/usr/share/omvzfs/Exception.php");
@@ -12,7 +9,7 @@
  * Implements the storage device backend for ZFS Zvol devices.
  * @ingroup api
  */
-class OMVStorageDeviceBackendZvol extends System\Storage\Backend\BackendAbstract {
+class OMVStorageDeviceBackendZvol extends \OMV\System\Storage\Backend\BackendAbstract {
     function getType() {
         return OMV_STORAGE_DEVICE_TYPE_ZVOL;
     }
@@ -47,7 +44,7 @@ function fsDeviceFile($deviceFile) {
  * This class provides a simple interface to handle ZFS Zvol devices.
  * @ingroup api
  */
-class OMVStorageDeviceZvol extends System\Storage\StorageDevice {
+class OMVStorageDeviceZvol extends \OMV\System\Storage\StorageDevice {
     /**
      * Get the description of the device.
      * @return The device description, FALSE on failure.
@@ -61,7 +58,7 @@ public function getDescription() {
     }
 }
 
-class OMVFilesystemZFS extends System\Filesystem\Filesystem {
+class OMVFilesystemZFS extends \OMV\System\Filesystem\Filesystem {
 
 	public function __construct($fsName) {
 		$this->deviceFile = $fsName;
@@ -427,7 +424,7 @@ public static function hasFileSystem($deviceFile) {
     }
 }
 
-class OMVFilesystemBackendZFS extends System\Filesystem\Backend\BackendAbstract {
+class OMVFilesystemBackendZFS extends \OMV\System\Filesystem\Backend\BackendAbstract {
     public function __construct() {
         $this->type = "zfs";
         $this->properties = self::PROP_POSIX_ACL;
@@ -467,6 +464,8 @@ public function isBlkidEnumerated() {
 
 }
 
-$mngr = Manager::getInstance();
+$mngr = \OMV\System\Storage\Backend\Manager::getInstance();
+$mngr->registerBackend(new OMVStorageDeviceBackendZvol());
+$mngr = \OMV\System\Filesystem\Backend\Manager::getInstance();
 $mngr->registerBackend(new OMVFilesystemBackendZFS());
 ?>