From fc99995db3dc1bddcad8913ba5798c282d69d010 Mon Sep 17 00:00:00 2001 From: Leo Zhang Date: Tue, 13 Mar 2018 13:07:53 +0800 Subject: [PATCH] osd/bluestore: delete unused variable in KernelDevice Signed-off-by: Leo Zhang --- src/os/bluestore/KernelDevice.cc | 9 +-------- src/os/bluestore/KernelDevice.h | 5 +++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc index 30cea5c6f06..227906c4625 100644 --- 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 791c1e8fbf6..a753e7be238 100644 --- a/src/os/bluestore/KernelDevice.h +++ b/src/os/bluestore/KernelDevice.h @@ -17,8 +17,10 @@ #include -#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 -- 2.39.5