diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-09-01 13:33:58 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-09-14 00:45:32 -0700 |
| commit | 1f9a6dd1d1df2db0d4cf6961b3e54c0ea2ea0171 (patch) | |
| tree | 66fbb51af6fbb144ff0c6ba11219e611f75f676d | |
| parent | b25bd7d84eb2f41f4f3a64e50c5db119055e4956 (diff) | |
| download | ceph-1f9a6dd1d1df2db0d4cf6961b3e54c0ea2ea0171.tar.gz | |
ReplicatedPG/Backend: convert sub_op_pull
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedBackend.h | 2 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 2 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index 9a78aa7254b..39dc01507c9 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -194,7 +194,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 ca42e8c78d0..15f7bdaf245 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6545,7 +6545,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 0859eb57e51..4e8b2981f48 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -847,7 +847,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 -- |