diff options
| author | Greg Farnum <greg@inktank.com> | 2013-08-20 14:21:32 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-08-27 17:24:49 -0700 |
| commit | 931bf7e8a8d30550072767d9ca46c25d985c300c (patch) | |
| tree | 417e2f6e3cbfd7e5a6f87a979bc8c7b940266b3a /src/osdc | |
| parent | 17e32f950646b80a715d35ea46a879ffc41447ba (diff) | |
| download | ceph-931bf7e8a8d30550072767d9ca46c25d985c300c.tar.gz | |
Objecter: rename Op::version to Op::replay_version
This is used for replay, so let's be more precise!
Signed-off-by: Greg Farnum <greg@inktank.com>
Diffstat (limited to 'src/osdc')
| -rw-r--r-- | src/osdc/Objecter.cc | 6 | ||||
| -rw-r--r-- | src/osdc/Objecter.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 59803e0559d..6ed5a32e54f 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1445,8 +1445,8 @@ void Objecter::send_op(Op *op) m->set_mtime(op->mtime); m->set_retry_attempt(op->attempts++); - if (op->version != eversion_t()) - m->set_version(op->version); // we're replaying this op! + if (op->replay_version != eversion_t()) + m->set_version(op->replay_version); // we're replaying this op! if (op->priority) m->set_priority(op->priority); @@ -1592,7 +1592,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m) // ack|commit -> ack if (op->onack) { ldout(cct, 15) << "handle_osd_op_reply ack" << dendl; - op->version = m->get_replay_version(); + op->replay_version = m->get_replay_version(); onack = op->onack; op->onack = 0; // only do callback once num_unacked--; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 090fb331611..68830762e1e 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -768,7 +768,7 @@ public: Context *onack, *oncommit; tid_t tid; - eversion_t version; // for op replay + eversion_t replay_version; // for op replay int attempts; bool paused; |