X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fos%2Ffilestore%2FZFSFileStoreBackend.cc;h=45384781e98440c1c9b05e2ac06e68efd91929e0;hb=224ce89bce8186937e77bdbda572a650953f8c23;hp=30cc6f9c36e0c6fe45de61ccd548c0356e432135;hpb=06dae762bfef1ba116dc58483c7b68b733d853e0;p=ceph.git diff --git a/ceph/src/os/filestore/ZFSFileStoreBackend.cc b/ceph/src/os/filestore/ZFSFileStoreBackend.cc index 30cc6f9c3..45384781e 100644 --- a/ceph/src/os/filestore/ZFSFileStoreBackend.cc +++ b/ceph/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