From 3ebb584b71fcc294a632317a08f1b1d975265fa0 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Thu, 21 Jan 2016 09:40:26 -0800
Subject: [PATCH] librbd: fixed "hidden" virtual methods

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/client/ObjecterWriteback.h        | 1 +
 src/kv/KineticStore.h                 | 1 +
 src/librbd/LibrbdWriteback.h          | 1 +
 src/test/ObjectMap/KeyValueDBMemory.h | 1 +
 src/test/msgr/perf_msgr_server.cc     | 1 +
 src/test/osdc/FakeWriteback.h         | 2 ++
 6 files changed, 7 insertions(+)

diff --git a/src/client/ObjecterWriteback.h b/src/client/ObjecterWriteback.h
index 8acd3f736202b..cb27723eb9b69 100644
--- a/src/client/ObjecterWriteback.h
+++ b/src/client/ObjecterWriteback.h
@@ -43,6 +43,7 @@ class ObjecterWriteback : public WritebackHandler {
   }
 
   virtual bool can_scattered_write() { return true; }
+  using WritebackHandler::write;
   virtual ceph_tid_t write(const object_t& oid, const object_locator_t& oloc,
                            vector<pair<uint64_t, bufferlist> >& io_vec,
 			   const SnapContext& snapc, ceph::real_time mtime,
diff --git a/src/kv/KineticStore.h b/src/kv/KineticStore.h
index f275b896bfd61..2d02c8c51eed8 100644
--- a/src/kv/KineticStore.h
+++ b/src/kv/KineticStore.h
@@ -106,6 +106,7 @@ public:
     const std::set<string> &key,
     std::map<string, bufferlist> *out
     );
+  using KeyValueDB::get;
 
   class KineticWholeSpaceIteratorImpl :
     public KeyValueDB::WholeSpaceIteratorImpl {
diff --git a/src/librbd/LibrbdWriteback.h b/src/librbd/LibrbdWriteback.h
index d4cb34161b25b..018b04367a393 100644
--- a/src/librbd/LibrbdWriteback.h
+++ b/src/librbd/LibrbdWriteback.h
@@ -39,6 +39,7 @@ namespace librbd {
 			     ceph::real_time mtime, uint64_t trunc_size,
 			     __u32 trunc_seq, ceph_tid_t journal_tid,
 			     Context *oncommit);
+    using WritebackHandler::write;
 
     virtual void overwrite_extent(const object_t& oid, uint64_t off,
 				  uint64_t len, ceph_tid_t journal_tid);
diff --git a/src/test/ObjectMap/KeyValueDBMemory.h b/src/test/ObjectMap/KeyValueDBMemory.h
index 94e224b33f86f..563e7bdc32e8f 100644
--- a/src/test/ObjectMap/KeyValueDBMemory.h
+++ b/src/test/ObjectMap/KeyValueDBMemory.h
@@ -34,6 +34,7 @@ public:
     const std::set<string> &key,
     std::map<string, bufferlist> *out
     );
+  using KeyValueDB::get;
 
   int get_keys(
     const string &prefix,
diff --git a/src/test/msgr/perf_msgr_server.cc b/src/test/msgr/perf_msgr_server.cc
index 3989cd234905e..ac7bc0c9d520e 100644
--- a/src/test/msgr/perf_msgr_server.cc
+++ b/src/test/msgr/perf_msgr_server.cc
@@ -58,6 +58,7 @@ class ServerDispatcher : public Dispatcher {
       messages.pop_front();
       return m;
     }
+    using ThreadPool::WorkQueue<Message>::_process;
     void _process(Message *m, ThreadPool::TPHandle &handle) {
       MOSDOp *osd_op = static_cast<MOSDOp*>(m);
       MOSDOpReply *reply = new MOSDOpReply(osd_op, 0, 0, 0, false);
diff --git a/src/test/osdc/FakeWriteback.h b/src/test/osdc/FakeWriteback.h
index 2d77e92b3fd30..8ab665c8c407c 100644
--- a/src/test/osdc/FakeWriteback.h
+++ b/src/test/osdc/FakeWriteback.h
@@ -29,6 +29,8 @@ public:
 			   __u32 trunc_seq, ceph_tid_t journal_tid,
 			   Context *oncommit);
 
+  using WritebackHandler::write;
+
   virtual bool may_copy_on_write(const object_t&, uint64_t, uint64_t,
 				 snapid_t);
 private:
-- 
2.39.5