]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: check mdsdir against dest
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 6 May 2017 18:06:06 +0000 (14:06 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 6 May 2017 18:06:14 +0000 (14:06 -0400)
Introduced by aebc1caee86b70f51d7d2d16f25f0ee9e4119f43. Found by Zheng.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/Migrator.cc

index 41bc508d8f4c009c539234b7dfaf5e9469c8c2d8..5aaea42b0b7882390dce1e05a38d687545b626d2 100644 (file)
@@ -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;
   }