From: Sage Weil <sage@newdream.net>
Date: Thu, 2 Jun 2011 21:50:45 +0000 (-0700)
Subject: journaler: fix trim crash after standby-replay -> active
X-Git-Tag: v0.29~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a13b66436561bfe86f4907d18d2ea7762632d36d;p=ceph.git

journaler: fix trim crash after standby-replay -> active

The reread_head method needs to initialize trimming_pos (like read_head
does) or else we get confused later.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 003d2bd9ce82..530fe99ee05f 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -179,7 +179,7 @@ void Journaler::_finish_reread_head(int r, bufferlist& bl, Context *finish)
   ::decode(h, p);
   prezeroing_pos = prezero_pos = write_pos = flush_pos = h.write_pos;
   expire_pos = h.expire_pos;
-  trimmed_pos = h.trimmed_pos;
+  trimmed_pos = trimming_pos = h.trimmed_pos;
   init_headers(h);
   state = STATE_ACTIVE;
   finish->finish(r);