From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Wed, 19 Mar 2014 03:09:07 +0000 (+0800)
Subject: mds: don't mark scatter locks dirty when dirfrag is dirty
X-Git-Tag: v0.79~111^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a86716660c8226f4b11dfed59eddb4f28765bd0d;p=ceph.git

mds: don't mark scatter locks dirty when dirfrag is dirty

The journal reply code has check that decides which scatter locks
should be marked as dirty. So don't unconditionally mark scatter
locks dirty when dirfrag is dirty

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index f818d7c410a..104212eae5e 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1001,8 +1001,6 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg, MDSlaveUpdate *slaveup)
 
     if (lump.is_dirty()) {
       dir->_mark_dirty(logseg);
-      dir->get_inode()->filelock.mark_dirty();
-      dir->get_inode()->nestlock.mark_dirty();
 
       if (!(dir->fnode.rstat == dir->fnode.accounted_rstat)) {
 	dout(10) << "EMetaBlob.replay      dirty nestinfo on " << *dir << dendl;