bluestore/NVMEDevice: remove useless IOSegment, and set

dpdk_thread_adaptor as static.

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@intel.com>

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index adb82c64eda65304e3c0a6ec08949517ca9bcdbe..268a2da7eced48f64366d4b3edcfbe75282f050a 100644 (file)
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -72,17 +72,12 @@ enum {
 
 static void io_complete(void *t, const struct spdk_nvme_cpl *completion);
 
-int dpdk_thread_adaptor(void *f)
+static int dpdk_thread_adaptor(void *f)
 {
   (*static_cast<std::function<void ()>*>(f))();
   return 0;
 }
 
-struct IOSegment {
-  uint32_t len;
-  void *addr;
-};
-
 struct IORequest {
   uint16_t cur_seg_idx = 0;
   uint16_t nseg;

diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index 365e6a4a6fdae90b353a184c30c06c4d4a8a6c5b..74e045b0f5b1151164699c1471e8fbddb9dad170 100644 (file)
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -48,7 +48,6 @@ class NVMEDevice : public BlockDevice {
   SharedDriverData *driver;
   string name;
 
-  static void init();
  public:
   SharedDriverData *get_driver() { return driver; }