From: Sage Weil <sage@inktank.com>
Date: Sat, 31 Aug 2013 00:18:21 +0000 (-0700)
Subject: osd/ReplicatedPG: log previous user_version on clone
X-Git-Tag: v0.69~21^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=72c6c302551eae126d844f452b9195e98dcdbbcc;p=ceph.git

osd/ReplicatedPG: log previous user_version on clone

Nothing relies on this, but it makes sense to me.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d61d441cb43f..025e2d300d40 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3704,8 +3704,9 @@ void ReplicatedPG::make_writeable(OpContext *ctx)
 	     << " to " << coid << " v " << ctx->at_version
 	     << " snaps=" << snaps << dendl;
     ctx->log.push_back(pg_log_entry_t(pg_log_entry_t::CLONE, coid, ctx->at_version,
-				  ctx->obs->oi.version, info.last_user_version,
-				  ctx->reqid, ctx->new_obs.oi.mtime));
+				      ctx->obs->oi.version,
+				      ctx->obs->oi.user_version,
+				      ctx->reqid, ctx->new_obs.oi.mtime));
     ::encode(snaps, ctx->log.back().snaps);
 
     ctx->at_version.version++;