librbd: fixed "hidden" virtual methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librbd/object_map/Request.cc b/src/librbd/object_map/Request.cc
index 8a731e161be4446357ea6014f8601a881c2bac03..e95c22a2f08cf4c00fec8b3a2cfb9e33ff74ef24 100644 (file)
--- a/src/librbd/object_map/Request.cc
+++ b/src/librbd/object_map/Request.cc
@@ -33,7 +33,7 @@ bool Request::should_complete(int r) {
 
     {
       RWLock::WLocker l2(m_image_ctx.object_map_lock);
-      finish();
+      finish_request();
     }
     return true;
 

diff --git a/src/librbd/object_map/Request.h b/src/librbd/object_map/Request.h
index 84ed605d357e03e2f5ecc000b51c7df4f535f83b..6629ad9cbfbbf290ed4b50070f1504224742b061 100644 (file)
--- a/src/librbd/object_map/Request.h
+++ b/src/librbd/object_map/Request.h
@@ -33,8 +33,8 @@ protected:
     // never propagate an error back to the caller
     return 0;
   }
-  virtual void finish() = 0;
-  using AsyncRequest<>::finish;
+  virtual void finish_request() {
+  }
 
 private:
   /**

diff --git a/src/librbd/object_map/ResizeRequest.cc b/src/librbd/object_map/ResizeRequest.cc
index afbde42f98b6d8008f4fab510c61a7aebaa8d2ac..fcc6ec66b3f81695565b6e4362baef4a3fad1734 100644 (file)
--- a/src/librbd/object_map/ResizeRequest.cc
+++ b/src/librbd/object_map/ResizeRequest.cc
@@ -46,7 +46,7 @@ void ResizeRequest::send() {
   rados_completion->release();
 }
 
-void ResizeRequest::finish() {
+void ResizeRequest::finish_request() {
   CephContext *cct = m_image_ctx.cct;
 
   ldout(cct, 5) << &m_image_ctx << " resizing in-memory object map: "

diff --git a/src/librbd/object_map/ResizeRequest.h b/src/librbd/object_map/ResizeRequest.h
index c19241c6521880f3459b888356f585ab9ed1701c..dfe0bcc7e426c87773444263559fc950beae027a 100644 (file)
--- a/src/librbd/object_map/ResizeRequest.h
+++ b/src/librbd/object_map/ResizeRequest.h
@@ -33,8 +33,7 @@ public:
   virtual void send();
 
 protected:
-  virtual void finish();
-  using AsyncRequest<>::finish;
+  virtual void finish_request() override;
 
 private:
   ceph::BitVector<2> *m_object_map;

diff --git a/src/librbd/object_map/SnapshotCreateRequest.h b/src/librbd/object_map/SnapshotCreateRequest.h
index e2a25d0138447b6a866732ee587b894e7030a07b..e68b78ac9a70059444eb76e291b486ee26c3db9a 100644 (file)
--- a/src/librbd/object_map/SnapshotCreateRequest.h
+++ b/src/librbd/object_map/SnapshotCreateRequest.h
@@ -55,10 +55,6 @@ public:
 protected:
   virtual bool should_complete(int r);
 
-  virtual void finish() {
-  }
-  using AsyncRequest<>::finish;
-
 private:
   State m_state;
   ceph::BitVector<2> &m_object_map;

diff --git a/src/librbd/object_map/SnapshotRollbackRequest.h b/src/librbd/object_map/SnapshotRollbackRequest.h
index f697d49e2159dc9df471c9c22792f445d6d5db48..dd9430058ea3ec02dcb75a77d57f02a2c3da20fc 100644 (file)
--- a/src/librbd/object_map/SnapshotRollbackRequest.h
+++ b/src/librbd/object_map/SnapshotRollbackRequest.h
@@ -55,10 +55,6 @@ public:
 protected:
   virtual bool should_complete(int r);
 
-  virtual void finish() {
-  }
-  using AsyncRequest<>::finish;
-
 private:
   State m_state;
   uint64_t m_snap_id;

diff --git a/src/librbd/object_map/UpdateRequest.cc b/src/librbd/object_map/UpdateRequest.cc
index fc651ab145ade998ad93734ec6c87f212290b6d2..e8a5f4784d9ec3ec68d20fb1a57c3dc718710c8a 100644 (file)
--- a/src/librbd/object_map/UpdateRequest.cc
+++ b/src/librbd/object_map/UpdateRequest.cc
@@ -61,7 +61,7 @@ void UpdateRequest::send() {
   rados_completion->release();
 }
 
-void UpdateRequest::finish() {
+void UpdateRequest::finish_request() {
   ldout(m_image_ctx.cct, 20) << &m_image_ctx << " on-disk object map updated"
                              << dendl;
 }

diff --git a/src/librbd/object_map/UpdateRequest.h b/src/librbd/object_map/UpdateRequest.h
index 03a0909662cde1c0a3874b5eab9a14fa7b9f9a4c..d1ce4075dd0d4dab44b143873d54fccfe4643bde 100644 (file)
--- a/src/librbd/object_map/UpdateRequest.h
+++ b/src/librbd/object_map/UpdateRequest.h
@@ -33,8 +33,7 @@ public:
   virtual void send();
 
 protected:
-  virtual void finish();
-  using AsyncRequest<>::finish;
+  virtual void finish_request() override;
 
 private:
   ceph::BitVector<2> &m_object_map;