From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Wed, 4 Sep 2013 07:16:35 +0000 (+0800)
Subject: mds: re-integrate stray when link count >= 1
X-Git-Tag: v0.71~90^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e303b964f7c0129c2b0b83e2e719613271e822d8;p=ceph.git

mds: re-integrate stray when link count >= 1

no reason not to rename inode out of the stray directory if the
inode's link count > 1

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 786b0ac0742e..9d59b70249a3 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -9214,7 +9214,7 @@ void MDCache::eval_stray(CDentry *dn)
     }
     purge_stray(dn);
   }
-  else if (in->inode.nlink == 1) {
+  else if (in->inode.nlink >= 1) {
     // trivial reintegrate?
     if (!in->remote_parents.empty()) {
       CDentry *rlink = *in->remote_parents.begin();