From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 21 Nov 2017 09:42:40 +0000 (+0800)
Subject: mds: adjust pop_nested when importing subtree
X-Git-Tag: v13.1.0~332^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6538464bdb5e73b5f3d1114246662a16897428ae;p=ceph.git

mds: adjust pop_nested when importing subtree

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 48b10c8c4bb..6fe0911277c 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -2502,6 +2502,7 @@ void CDir::encode_export(bufferlist& bl)
 void CDir::finish_export(utime_t now)
 {
   state &= MASK_STATE_EXPORT_KEPT;
+  pop_nested.sub(now, cache->decayrate, pop_auth_subtree);
   pop_auth_subtree_nested.sub(now, cache->decayrate, pop_auth_subtree);
   pop_me.zero(now);
   pop_auth_subtree.zero(now);
@@ -2532,6 +2533,7 @@ void CDir::decode_import(bufferlist::iterator& blp, utime_t now, LogSegment *ls)
 
   decode(pop_me, now, blp);
   decode(pop_auth_subtree, now, blp);
+  pop_nested.add(now, cache->decayrate, pop_auth_subtree);
   pop_auth_subtree_nested.add(now, cache->decayrate, pop_auth_subtree);
 
   decode(dir_rep_by, blp);
@@ -2572,6 +2574,7 @@ void CDir::abort_import(utime_t now)
   if (is_dirty())
     mark_clean();
 
+  pop_nested.sub(now, cache->decayrate, pop_auth_subtree);
   pop_auth_subtree_nested.sub(now, cache->decayrate, pop_auth_subtree);
   pop_me.zero(now);
   pop_auth_subtree.zero(now);