From: Ma Jianpeng <jianpeng.ma@intel.com>
Date: Mon, 21 Jul 2014 07:08:55 +0000 (+0800)
Subject: os/FileJournal: When dump journal, using correctly seq avoid misjudging joural corrupt.
X-Git-Tag: v0.80.8~34^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e17a0872a3864cb6aee46959afd955ef0cbafeb;p=ceph.git

os/FileJournal: When dump journal, using correctly seq avoid misjudging joural corrupt.

In func FileJournal::dump, it always using seq=0 as last-seq and it can
misjudge the journal corrupt.

Signed-off-by: Ma Jianpeng <jianpeng.ma@intel.com>
(cherry picked from commit 5f65b4db6d1dad7c2c5a09eab42af63a82ea9e9b)
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index ce98877d96f0..5eab7b530aa2 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -567,9 +567,9 @@ int FileJournal::dump(ostream& out)
   JSONFormatter f(true);
 
   f.open_array_section("journal");
+  uint64_t seq = 0;
   while (1) {
     bufferlist bl;
-    uint64_t seq = 0;
     uint64_t pos = read_pos;
     if (!read_entry(bl, seq)) {
       dout(3) << "journal_replay: end of journal, done." << dendl;