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-19 12:50:44 -0700 |
| commit | be91c8977b46c46250dddb52db5e7af96c09cdba (patch) | |
| tree | 2b4f2ebc161d6b7d32e5d723482aceec678ac192 | |
| parent | 8faebd0682d92fe14600c0d2afdae56e998ff698 (diff) | |
| download | ceph-be91c8977b46c46250dddb52db5e7af96c09cdba.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 2273d72a8c4..60c31c4c2be 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 3c5de6501c9..9a1d80f6a51 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6666,7 +6666,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 5d8a3b54498..f68ec2c385d 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 -- |