From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 14 Apr 2017 07:35:10 +0000 (+0800)
Subject: mds: clear scatter dirty when deleting directory
X-Git-Tag: v12.1.0~10^2~28^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d5cd17b67c223025140643451d65947c8644d51;p=ceph.git

mds: clear scatter dirty when deleting directory

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 90835a8472f8..50476199ad6c 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12382,5 +12382,10 @@ void MDCache::clear_dirty_bits_for_stray(CInode* diri) {
     if (p->is_auth() && !(p->is_frozen() || p->is_freezing()))
       p->try_remove_dentries_for_stray();
   }
+  if (!diri->snaprealm) {
+    if (diri->is_auth())
+      diri->clear_dirty_rstat();
+    diri->clear_scatter_dirty();
+  }
 }