From: Gui Hecheng <guihecheng@cmss.chinamobile.com>
Date: Thu, 23 Feb 2017 09:26:46 +0000 (+0800)
Subject: librbd: adopt override for writesame related header files
X-Git-Tag: v12.0.1~250^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc9892b1182732f800acbc078840310bae7d6c5b;p=ceph.git

librbd: adopt override for writesame related header files

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
---

diff --git a/src/librbd/cache/PassthroughImageCache.h b/src/librbd/cache/PassthroughImageCache.h
index 5210e7c619dc..089430c7b5b8 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 aeabd50bfbae..4cb5d38ec43c 100644
--- a/src/librbd/io/ImageRequest.h
+++ b/src/librbd/io/ImageRequest.h
@@ -276,31 +276,31 @@ protected:
   using typename ImageRequest<ImageCtxT>::ObjectRequests;
   using typename AbstractImageWriteRequest<ImageCtxT>::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 99230f77fba9..f57bbe0b72fa 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;