Merge pull request #17112 from optimistyzy/821_spdk

NVMDevice: fix issued caused by #17002
ceph · Aug 21, 2017 · 6b9a641 · 6b9a641
2 parents 072d8ca + 2a3256a
commit 6b9a641
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h
@@ -92,10 +92,10 @@ class BlockDevice {
   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
@@ -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; }