osd/bluestore: delete unused variable in KernelDevice

Signed-off-by: Leo Zhang <nguzcf@gmail.com>

diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc
index 30cea5c6f0613f772b246e66dc0abb23dbeaa26a..227906c462548c41c7336560ebed67a4de608360 100644 (file)
--- a/src/os/bluestore/KernelDevice.cc
+++ b/src/os/bluestore/KernelDevice.cc
@@ -36,7 +36,7 @@ KernelDevice::KernelDevice(CephContext* cct, aio_callback_t cb, void *cbpriv, ai
   : BlockDevice(cct, cb, cbpriv),
     fd_direct(-1),
     fd_buffered(-1),
-    fs(NULL), aio(false), dio(false),
+    aio(false), dio(false),
     debug_lock("KernelDevice::debug_lock"),
     aio_queue(cct->_conf->bdev_aio_max_queue_depth),
     discard_callback(d_cb),
@@ -152,9 +152,6 @@ int KernelDevice::open(const string& p)
   }
   _discard_start();
 
-  fs = FS::create_by_fd(fd_direct);
-  assert(fs);
-
   // round size down to an even block
   size &= ~(block_size - 1);
 
@@ -195,10 +192,6 @@ void KernelDevice::close()
   _aio_stop();
   _discard_stop();
 
-  assert(fs);
-  delete fs;
-  fs = NULL;
-
   assert(fd_direct >= 0);
   VOID_TEMP_FAILURE_RETRY(::close(fd_direct));
   fd_direct = -1;

diff --git a/src/os/bluestore/KernelDevice.h b/src/os/bluestore/KernelDevice.h
index 791c1e8fbf6079ed4218c35ddbe4813b134cbd1d..a753e7be23853657e45c2ee99079c45e2b4815aa 100644 (file)
--- a/src/os/bluestore/KernelDevice.h
+++ b/src/os/bluestore/KernelDevice.h
@@ -17,8 +17,10 @@
 
 #include <atomic>
 
-#include "os/fs/FS.h"
+#include "include/types.h"
 #include "include/interval_set.h"
+#include "common/Mutex.h"
+#include "common/Cond.h"
 
 #include "aio.h"
 #include "BlockDevice.h"
@@ -26,7 +28,6 @@
 class KernelDevice : public BlockDevice {
   int fd_direct, fd_buffered;
   std::string path;
-  FS *fs;
   bool aio, dio;
 
   std::string devname;  ///< kernel dev name (/sys/block/$devname), if any