From dc9892b1182732f800acbc078840310bae7d6c5b Mon Sep 17 00:00:00 2001 From: Gui Hecheng Date: Thu, 23 Feb 2017 17:26:46 +0800 Subject: [PATCH] librbd: adopt override for writesame related header files Signed-off-by: Gui Hecheng --- src/librbd/cache/PassthroughImageCache.h | 6 +++--- src/librbd/io/ImageRequest.h | 26 ++++++++++++------------ src/librbd/io/ObjectRequest.h | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/librbd/cache/PassthroughImageCache.h b/src/librbd/cache/PassthroughImageCache.h index 5210e7c619dc7..089430c7b5b8b 100644 --- a/src/librbd/cache/PassthroughImageCache.h +++ b/src/librbd/cache/PassthroughImageCache.h @@ -29,9 +29,9 @@ public: void aio_discard(uint64_t offset, uint64_t length, bool skip_partial_discard, Context *on_finish); void aio_flush(Context *on_finish) override; - virtual void aio_writesame(uint64_t offset, uint64_t length, - ceph::bufferlist&& bl, - int fadvise_flags, Context *on_finish); + void aio_writesame(uint64_t offset, uint64_t length, + ceph::bufferlist&& bl, + int fadvise_flags, Context *on_finish) override; /// internal state methods void init(Context *on_finish) override; diff --git a/src/librbd/io/ImageRequest.h b/src/librbd/io/ImageRequest.h index aeabd50bfbaed..4cb5d38ec43c4 100644 --- a/src/librbd/io/ImageRequest.h +++ b/src/librbd/io/ImageRequest.h @@ -276,31 +276,31 @@ protected: using typename ImageRequest::ObjectRequests; using typename AbstractImageWriteRequest::ObjectExtents; - virtual aio_type_t get_aio_type() const { + aio_type_t get_aio_type() const override { return AIO_TYPE_WRITESAME; } - virtual const char *get_request_type() const { + const char *get_request_type() const override { return "aio_writesame"; } bool assemble_writesame_extent(const ObjectExtent &object_extent, bufferlist *bl, bool force_write); - virtual void send_image_cache_request() override; + void send_image_cache_request() override; - virtual void send_object_cache_requests(const ObjectExtents &object_extents, - uint64_t journal_tid); + void send_object_cache_requests(const ObjectExtents &object_extents, + uint64_t journal_tid) override; - virtual void send_object_requests(const ObjectExtents &object_extents, - const ::SnapContext &snapc, - ObjectRequests *object_requests); - virtual ObjectRequestHandle *create_object_request( + void send_object_requests(const ObjectExtents &object_extents, + const ::SnapContext &snapc, + ObjectRequests *object_requests) override; + ObjectRequestHandle *create_object_request( const ObjectExtent &object_extent, const ::SnapContext &snapc, - Context *on_finish); + Context *on_finish) override; - virtual uint64_t append_journal_event(const ObjectRequests &requests, - bool synchronous); - virtual void update_stats(size_t length); + uint64_t append_journal_event(const ObjectRequests &requests, + bool synchronous) override; + void update_stats(size_t length) override; private: bufferlist m_data_bl; int m_op_flags; diff --git a/src/librbd/io/ObjectRequest.h b/src/librbd/io/ObjectRequest.h index 99230f77fba91..f57bbe0b72fa5 100644 --- a/src/librbd/io/ObjectRequest.h +++ b/src/librbd/io/ObjectRequest.h @@ -470,19 +470,19 @@ public: m_write_data(data), m_op_flags(op_flags) { } - virtual const char *get_op_type() const { + const char *get_op_type() const override { return "writesame"; } - virtual bool pre_object_map_update(uint8_t *new_state) { + bool pre_object_map_update(uint8_t *new_state) override { *new_state = OBJECT_EXISTS; return true; } protected: - virtual void add_write_ops(librados::ObjectWriteOperation *wr); + void add_write_ops(librados::ObjectWriteOperation *wr) override; - virtual void send_write(); + void send_write() override; private: ceph::bufferlist m_write_data; -- 2.39.5