From 153660c820a76d4c9d4b6b560a18fc255aa23b8c Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Mon, 4 Jan 2016 22:33:58 +0800 Subject: [PATCH] BlockDevice: Add override to explicit Signed-off-by: Haomai Wang --- src/os/bluestore/KernelDevice.h | 22 +++++++++++----------- src/os/bluestore/NVMEDevice.h | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/os/bluestore/KernelDevice.h b/src/os/bluestore/KernelDevice.h index 3d25826d1a176..454ac825ba046 100644 --- a/src/os/bluestore/KernelDevice.h +++ b/src/os/bluestore/KernelDevice.h @@ -65,33 +65,33 @@ class KernelDevice : public BlockDevice { public: KernelDevice(aio_callback_t cb, void *cbpriv); - void aio_submit(IOContext *ioc); + void aio_submit(IOContext *ioc) override; - uint64_t get_size() const { + uint64_t get_size() const override { return size; } - uint64_t get_block_size() const { + uint64_t get_block_size() const override { return block_size; } int read(uint64_t off, uint64_t len, bufferlist *pbl, IOContext *ioc, - bool buffered); - int read_buffered(uint64_t off, uint64_t len, char *buf); + bool buffered) override; + int read_buffered(uint64_t off, uint64_t len, char *buf) override; int aio_write(uint64_t off, bufferlist& bl, IOContext *ioc, - bool buffered); + bool buffered) override; int aio_zero(uint64_t off, uint64_t len, - IOContext *ioc); - int flush(); + IOContext *ioc) override; + int flush() override; void queue_reap_ioc(IOContext *ioc); // for managing buffered readers/writers - int invalidate_cache(uint64_t off, uint64_t len); - int open(string path); - void close(); + int invalidate_cache(uint64_t off, uint64_t len) override; + int open(string path) override; + void close() override; }; #endif diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h index 81a67621288cc..b257f9348b2b2 100644 --- a/src/os/bluestore/NVMEDevice.h +++ b/src/os/bluestore/NVMEDevice.h @@ -54,30 +54,30 @@ class NVMEDevice : public BlockDevice { public: NVMEDevice(aio_callback_t cb, void *cbpriv); - void aio_submit(IOContext *ioc) {} + void aio_submit(IOContext *ioc) override {} - uint64_t get_size() const { + uint64_t get_size() const override { return size; } - uint64_t get_block_size() const { + uint64_t get_block_size() const override { return block_size; } int read(uint64_t off, uint64_t len, bufferlist *pbl, IOContext *ioc, - bool buffered); + bool buffered) override; int aio_write(uint64_t off, bufferlist& bl, IOContext *ioc, - bool buffered); + bool buffered) override ; int aio_zero(uint64_t off, uint64_t len, - IOContext *ioc); - int flush(); + IOContext *ioc) override; + int flush() override; // for managing buffered readers/writers - int invalidate_cache(uint64_t off, uint64_t len); - int open(string path); - void close(); + int invalidate_cache(uint64_t off, uint64_t len) override; + int open(string path) override; + void close() override; }; #endif -- 2.39.5