import 15.2.0 Octopus source

[ceph.git] / ceph / src / os / bluestore / BlockDevice.cc

diff --git a/ceph/src/os/bluestore/BlockDevice.cc b/ceph/src/os/bluestore/BlockDevice.cc
index bba9a96cd6808994c5c6940adfad2a9a3006b260..832f6b85393f84569feb60b7fe8e98b85b3fc7ee 100644 (file)
--- a/ceph/src/os/bluestore/BlockDevice.cc
+++ b/ceph/src/os/bluestore/BlockDevice.cc
@@ -27,7 +27,7 @@
 #include "NVMEDevice.h"
 #endif
 
-#if defined(HAVE_PMEM)
+#if defined(HAVE_BLUESTORE_PMEM)
 #include "PMEMDevice.h"
 #include "libpmem.h"
 #endif
@@ -96,7 +96,7 @@ BlockDevice *BlockDevice::create(CephContext* cct, const string& path,
       type = "ust-nvme";
   }
 
-#if defined(HAVE_PMEM)
+#if defined(HAVE_BLUESTORE_PMEM)
   if (type == "kernel") {
     int is_pmem = 0;
     size_t map_len = 0;
@@ -115,7 +115,7 @@ BlockDevice *BlockDevice::create(CephContext* cct, const string& path,
 
   dout(1) << __func__ << " path " << path << " type " << type << dendl;
 
-#if defined(HAVE_PMEM)
+#if defined(HAVE_BLUESTORE_PMEM)
   if (type == "pmem") {
     return new PMEMDevice(cct, cb, cbpriv);
   }
@@ -125,12 +125,13 @@ BlockDevice *BlockDevice::create(CephContext* cct, const string& path,
     return new KernelDevice(cct, cb, cbpriv, d_cb, d_cbpriv);
   }
 #endif
+#ifndef WITH_SEASTAR
 #if defined(HAVE_SPDK)
   if (type == "ust-nvme") {
     return new NVMEDevice(cct, cb, cbpriv);
   }
 #endif
-
+#endif
 
   derr << __func__ << " unknown backend " << type << dendl;
   ceph_abort();