From: Ziye Yang <optimistyzy@gmail.com>
Date: Mon, 21 Aug 2017 08:55:10 +0000 (+0800)
Subject: NVMDevice: fix issued caused by #17002
X-Git-Tag: v13.0.0~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17112%2Fhead;p=ceph.git

NVMDevice: fix issued caused by #17002

Patch #17002 breaks running osd when using spdk, and
this patch can fix this.

Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
---

diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h
index a90cedeb854..6ae34fd927d 100644
--- a/src/os/bluestore/BlockDevice.h
+++ b/src/os/bluestore/BlockDevice.h
@@ -92,10 +92,10 @@ protected:
   uint64_t size;
   uint64_t block_size;
   bool rotational = true;
-  aio_callback_t aio_callback;
-  void *aio_callback_priv;
 
 public:
+  aio_callback_t aio_callback;
+  void *aio_callback_priv;
   BlockDevice(CephContext* cct, aio_callback_t cb, void *cbpriv)
   : cct(cct),
     size(0),
diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index 21ce0d91535..a573e199305 100644
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -199,9 +199,6 @@ class NVMEDevice : public BlockDevice {
   SharedDriverData *get_driver() { return driver; }
 
  public:
-  aio_callback_t aio_callback;
-  void *aio_callback_priv;
-
   NVMEDevice(CephContext* cct, aio_callback_t cb, void *cbpriv);
 
   bool supported_bdev_label() override { return false; }