os/bluestore: fix pmem osd build problem

Signed-off-by: Peterson, Scott <scott.d.peterson@intel.com>
Signed-off-by: Li, Xiaoyan <xiaoyan.li@intel.com>

diff --git a/src/os/bluestore/PMEMDevice.cc b/src/os/bluestore/PMEMDevice.cc
index 1f9d9599b1e1af93c416951cb328323726ebf9ac..cf305536707a3ccde09148729b28908eab088b20 100644 (file)
--- a/src/os/bluestore/PMEMDevice.cc
+++ b/src/os/bluestore/PMEMDevice.cc
@@ -143,7 +143,7 @@ int PMEMDevice::collect_metadata(const string& prefix, map<string,string> *pm) c
   if (S_ISBLK(st.st_mode)) {
     (*pm)[prefix + "access_mode"] = "blk";
     char buffer[1024] = {0};
-    BlkDev blkdev(fd_buffered);
+    BlkDev blkdev(fd);
 
     blkdev.model(buffer, sizeof(buffer));
     (*pm)[prefix + "model"] = buffer;
@@ -184,7 +184,7 @@ void PMEMDevice::aio_submit(IOContext *ioc)
   return;
 }
 
-int PMEMDevice::write(uint64_t off, bufferlist& bl, bool buffered, int write_hint = WRITE_LIFE_NOT_SET)
+int PMEMDevice::write(uint64_t off, bufferlist& bl, bool buffered, int write_hint)
 {
   uint64_t len = bl.length();
   dout(20) << __func__ << " " << off << "~" << len  << dendl;
@@ -219,7 +219,7 @@ int PMEMDevice::aio_write(
   bufferlist &bl,
   IOContext *ioc,
   bool buffered,
-  int write_hint = WRITE_LIFE_NOT_SET)
+  int write_hint)
 {
   return write(off, bl, buffered);
 }