From: Samuel Just <sam.just@inktank.com>
Date: Sun, 1 Sep 2013 20:33:58 +0000 (-0700)
Subject: ReplicatedPG/Backend: convert sub_op_pull
X-Git-Tag: v0.71~68^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8daaeba3f598a6fbe2bfb5f42fe011ee78d2fd9f;p=ceph.git

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 2273d72a8c43..60c31c4c2be3 100644
--- 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 69f87cfa0996..fb03ca83b6e2 100644
--- 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 51a82e508e6a..493929949446 100644
--- 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 --