diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-08-30 15:47:18 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-09-19 20:04:17 -0700 |
| commit | 471fdd59f73d5ede68653abfb35fe942f28b3abd (patch) | |
| tree | 3a1e00351dbce1e763673fa5cb3dae1e43ef18aa | |
| parent | ece232efe05ade7c538659142f2278386ef5421a (diff) | |
| download | ceph-471fdd59f73d5ede68653abfb35fe942f28b3abd.tar.gz | |
ReplicatedPG/Backend: shuffle sub_op_push_reply
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 ba79d06de5f..2273d72a8c4 100644 --- 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 74a7ae419f9..1b6d0f40b36 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6577,7 +6577,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 5581c601495..e189820c834 100644 --- 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); |