From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Thu, 19 Sep 2013 05:43:39 +0000 (+0800)
Subject: mds: don't fragmentate stray directories
X-Git-Tag: v0.72-rc1~39^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a242201d58f5facb4eefcde38e3fd5e9d6f61de7;p=ceph.git

mds: don't fragmentate stray directories

the code that prepares and purges stray dentry assumes that we never
freeze stray directories. So disable fragmentating stray directories
temporarily.

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index bde5735ea89..5652a08d757 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -10873,8 +10873,8 @@ bool MDCache::can_fragment(CInode *diri, list<CDir*>& dirs)
     dout(7) << "can_fragment: i won't merge|split anything in stray" << dendl;
     return false;
   }
-  if (diri->is_mdsdir() || diri->ino() == MDS_INO_CEPH) {
-    dout(7) << "can_fragment: i won't fragment the mdsdir or .ceph" << dendl;
+  if (diri->is_mdsdir() || diri->is_stray() || diri->ino() == MDS_INO_CEPH) {
+    dout(7) << "can_fragment: i won't fragment the mdsdir or straydir or .ceph" << dendl;
     return false;
   }