osd/bluestore: delete unused variable in KernelDevice

Signed-off-by: Leo Zhang <[email protected]>
iceph · Mar 13, 2018 · fc99995 · fc99995
1 parent 41ec438
commit fc99995
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -17,16 +17,17 @@
 
 #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"
 
 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