From d53fc899eba9f222c092132c7fc6eaa8d936d626 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 30 Aug 2013 15:47:18 -0700 Subject: [PATCH] ReplicatedPG/Backend: shuffle sub_op_push_reply Signed-off-by: Samuel Just --- src/osd/ReplicatedBackend.h | 2 +- src/osd/ReplicatedPG.cc | 2 +- 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 ba79d06de5fe8..2273d72a8c434 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -201,7 +201,7 @@ private: map > 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 bb6b9cc209348..a0aded18a8223 100644 --- 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(op->request); const hobject_t& soid = reply->get_poid(); diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 368371939d1c2..67c25ee3df140 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); -- 2.39.5