From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 16 Dec 2015 21:18:55 +0000 (-0500)
Subject: librbd: fixed "hidden" virtual methods
X-Git-Tag: v10.0.3~24^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac86521bb608f297ac135f9614f23428dd67b8b6;p=ceph.git

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 8a731e161be4..e95c22a2f08c 100644
--- 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 84ed605d357e..6629ad9cbfbb 100644
--- 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 afbde42f98b6..fcc6ec66b3f8 100644
--- 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 c19241c65218..dfe0bcc7e426 100644
--- 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 e2a25d013844..e68b78ac9a70 100644
--- 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 f697d49e2159..dd9430058ea3 100644
--- 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 fc651ab145ad..e8a5f4784d9e 100644
--- 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 03a0909662cd..d1ce4075dd0d 100644
--- 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;