From: Kefu Chai <kchai@redhat.com>
Date: Mon, 26 Jun 2017 03:59:45 +0000 (+0800)
Subject: os/ZFS: make it compilable
X-Git-Tag: v12.1.2~1^2~16^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e34e22b6efda763da705637fdbb067d45149107a;p=ceph.git

os/ZFS: make it compilable

* `cct` is not globally avaiable, use cct() wrapper instead
* libzfs.h is always avaiable here. so remove the guard

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/os/filestore/ZFSFileStoreBackend.cc b/src/os/filestore/ZFSFileStoreBackend.cc
index 30cc6f9c36e0c..45384781e9844 100644
--- a/src/os/filestore/ZFSFileStoreBackend.cc
+++ b/src/os/filestore/ZFSFileStoreBackend.cc
@@ -26,17 +26,16 @@
 #include "common/config.h"
 #include "common/sync_filesystem.h"
 
-#ifdef HAVE_LIBZFS
-
 #include "ZFSFileStoreBackend.h"
 
+#define dout_context cct()
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix
 #define dout_prefix *_dout << "zfsfilestorebackend(" << get_basedir_path() << ") "
 
 ZFSFileStoreBackend::ZFSFileStoreBackend(FileStore *fs) :
   GenericFileStoreBackend(fs), base_zh(NULL), current_zh(NULL),
-  m_filestore_zfs_snap(cct->_conf->filestore_zfs_snap)
+  m_filestore_zfs_snap(cct()->_conf->filestore_zfs_snap)
 {
   int ret = zfs.init();
   if (ret < 0) {
@@ -257,4 +256,3 @@ int ZFSFileStoreBackend::destroy_checkpoint(const string& name)
   }
   return ret;
 }
-#endif