mds: Call trim_non_auth_subtree when appropriate.

This commit is contained in:
Greg Farnum 2010-10-29 11:03:08 -07:00
parent 207452180b
commit 404c83e3e5
2 changed files with 3 additions and 0 deletions

View File

@ -1858,6 +1858,8 @@ void Migrator::import_reverse(CDir *dir)
// update auth, with possible subtree merge.
assert(dir->is_subtree_root());
if (mds->is_resolve())
cache->trim_non_auth_subtree(dir);
cache->adjust_subtree_auth(dir, import_peer[dir->dirfrag()]);
cache->try_subtree_merge(dir);

View File

@ -1025,6 +1025,7 @@ void EExport::replay(MDS *mds)
}
// adjust auth away
mds->mdcache->trim_non_auth_subtree(dir);
mds->mdcache->adjust_bounded_subtree_auth(dir, realbounds, pair<int,int>(CDIR_AUTH_UNKNOWN, CDIR_AUTH_UNKNOWN));
mds->mdcache->try_subtree_merge(dir);
}