From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 6 May 2017 18:06:06 +0000 (-0400)
Subject: mds: check mdsdir against dest
X-Git-Tag: v12.0.3~38^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c9c294d14311a25ac0dfafd6506e8e4d9c642f6;p=ceph.git

mds: check mdsdir against dest

Introduced by aebc1caee86b70f51d7d2d16f25f0ee9e4119f43. Found by Zheng.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 41bc508d8f4c..5aaea42b0b78 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -794,7 +794,7 @@ void Migrator::export_dir(CDir *dir, mds_rank_t dest)
   }
 
   if (!dir->inode->is_base() && dir->inode->get_projected_parent_dir()->inode->is_stray() &&
-      dir->inode->get_projected_parent_dir()->get_parent_dir()->inode->is_mdsdir()) {
+      dir->inode->get_projected_parent_dir()->get_parent_dir()->ino() != MDS_INO_MDSDIR(dest)) {
     dout(7) << "i won't export anything in stray" << dendl;
     return;
   }