From 2a3256a354c3dbf75c45ae35427f1cb76072c7d6 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Mon, 21 Aug 2017 16:55:10 +0800 Subject: [PATCH] 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 --- src/os/bluestore/BlockDevice.h | 4 ++-- src/os/bluestore/NVMEDevice.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h index a90cedeb8543d..6ae34fd927d6b 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 21ce0d91535fd..a573e199305eb 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; } -- 2.47.3