From: John Spray <john.spray@redhat.com>
Date: Fri, 24 Jul 2015 08:37:15 +0000 (+0100)
Subject: mds: fix val used in inode->last_journaled
X-Git-Tag: v9.1.0~485^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5336%2Fhead;p=ceph.git

mds: fix val used in inode->last_journaled

This was getting assigned with LogEvent::get_start_offset
on an uncommitted LogEvent, which is junk.  During replay
last_journaled is compared with the metablob's event_seq,
so that's what should be used here.

This change just from code inspection -- haven't seen this
manifest as an actual misbehaviour.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index e7e0e0a39a7..eff1025a9af 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -2932,7 +2932,8 @@ int Migrator::decode_import_dir(bufferlist::iterator& blp,
     else if (icode == 'I') {
       // inode
       assert(le);
-      decode_import_inode(dn, blp, oldauth, ls, le->get_start_off(), peer_exports, updated_scatterlocks);
+      decode_import_inode(dn, blp, oldauth, ls, le->get_metablob()->event_seq,
+          peer_exports, updated_scatterlocks);
     }
     
     // add dentry to journal entry