From: Greg Farnum <greg@inktank.com>
Date: Thu, 22 Aug 2013 21:54:19 +0000 (-0700)
Subject: ReplicatedPG: do not do a redundant set of ctx->new_obs.oi.version
X-Git-Tag: v0.69~40^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f608bd967d177773b14a6020fbc11b2fc52d56a;p=ceph.git

ReplicatedPG: do not do a redundant set of ctx->new_obs.oi.version

We set this in the if below for writes, and for reads it doesn't need to
be updated (and isn't). Remove the confusing double-set so future code
inspectors don't get concerned there's a bug like I did.

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 516ac745edcfe..dc2ef94973159 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3853,7 +3853,6 @@ int ReplicatedPG::prepare_transaction(OpContext *ctx)
   }
   ctx->reply_version = ctx->new_obs.oi.user_version;
   ctx->bytes_written = ctx->op_t.get_encoded_bytes();
-  ctx->new_obs.oi.version = ctx->at_version;
  
   if (ctx->new_obs.exists) {
     // on the head object