ReplicatedPG/Backend: convert sub_op_pull

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 2273d72a8c434aedb7129ca49975bcc5170982a5..60c31c4c2be34cfe4bdf46323b85034f60d4a112 100644 (file)
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -202,7 +202,7 @@ private:
 
   void sub_op_push(OpRequestRef op);
   void sub_op_push_reply(OpRequestRef op);
-  void sub_op_pull(OpRequestRef op) {}
+  void sub_op_pull(OpRequestRef op);
 
   void _do_push(OpRequestRef op) {}
   void _do_pull_response(OpRequestRef op) {}

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 69f87cfa09962195cbbbd6ef9bb4eb4f473298c2..fb03ca83b6e2ef3dcc6215b5c56ed56d737f2a3e 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -6679,7 +6679,7 @@ void ReplicatedPG::finish_degraded_object(const hobject_t& oid)
  * process request to pull an entire object.
  * NOTE: called from opqueue.
  */
-void ReplicatedPG::sub_op_pull(OpRequestRef op)
+void ReplicatedBackend::sub_op_pull(OpRequestRef op)
 {
   MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
   assert(m->get_header().type == MSG_OSD_SUBOP);

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 51a82e508e6af6d836204f03e010e13cc28560c8..4939299494463c7ad7cfe566f2653ed974c9b343 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -852,7 +852,6 @@ protected:
   void recover_got(hobject_t oid, eversion_t v);
   void _failed_push(int from, const hobject_t &soid);
   bool handle_push_reply(int peer, PushReplyOp &op, PushOp *reply);
-  void sub_op_pull(OpRequestRef op);
   void handle_pull(int peer, PullOp &op, PushOp *reply);
 
   // -- copyfrom --