ReplicatedPG/Backend: shuffle sub_op_push_reply

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

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index ba79d06de5fe891fd19400b743fe12503aeb0784..2273d72a8c434aedb7129ca49975bcc5170982a5 100644 (file)
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -201,7 +201,7 @@ private:
   map<int, set<hobject_t> > pull_from_peer;
 
   void sub_op_push(OpRequestRef op);
-  void sub_op_push_reply(OpRequestRef op) {}
+  void sub_op_push_reply(OpRequestRef op);
   void sub_op_pull(OpRequestRef op) {}
 
   void _do_push(OpRequestRef op) {}

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index bb6b9cc2093485a9cbb41e8b31cdd475f2fb7592..a0aded18a8223cde9adedf6b832cbb0712708456 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -6590,7 +6590,7 @@ void ReplicatedPG::prep_push_op_blank(const hobject_t& soid, PushOp *op)
   op->soid = soid;
 }
 
-void ReplicatedPG::sub_op_push_reply(OpRequestRef op)
+void ReplicatedBackend::sub_op_push_reply(OpRequestRef op)
 {
   MOSDSubOpReply *reply = static_cast<MOSDSubOpReply*>(op->request);
   const hobject_t& soid = reply->get_poid();

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 368371939d1c2b7efe71c696481b96c00b1086b6..67c25ee3df1405f008059cedbfc091771c3b6886 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -851,7 +851,6 @@ protected:
   void _committed_pushed_object(epoch_t epoch, eversion_t lc);
   void recover_got(hobject_t oid, eversion_t v);
   void _failed_push(int from, const hobject_t &soid);
-  void sub_op_push_reply(OpRequestRef op);
   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);