From e42ef0c079b290cc8b549cca9fa2f8a29baabf72 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 20 Aug 2013 13:55:54 -0700 Subject: [PATCH] Objecter: expose MOSDOp's new user_version instead of the replay_version We don't want users to ever see the replay_version, which is about to become private RADOS data. Signed-off-by: Greg Farnum --- src/osdc/Objecter.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 3bab76c9f373..8782fd9e8a5a 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1515,7 +1515,8 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m) ldout(cct, 7) << "handle_osd_op_reply " << tid << (m->is_ondisk() ? " ondisk":(m->is_onnvram() ? " onnvram":" ack")) - << " v " << m->get_replay_version() << " in " << m->get_pg() + << " v " << m->get_replay_version() << " uv " << m->get_user_version() + << " in " << m->get_pg() << " attempt " << m->get_retry_attempt() << dendl; Op *op = ops[tid]; @@ -1552,7 +1553,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m) } if (op->objver) - *op->objver = m->get_replay_version(); + *op->objver = m->get_user_version(); if (op->reply_epoch) *op->reply_epoch = m->get_map_epoch(); -- 2.47.3