Merge pull request #12274 from ukernel/wip-multimds-misc

mds: misc multimds fixes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/mds/CInode.h
Simple merge

diff --cc src/mds/Locker.cc
Simple merge

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/Migrator.cc
index 853b3fa99b4b116fe3d99db030bff8488a388ba2,64168a156400152682e90cacf6082100b0081157..c1cbc4cb870ad6237bf0640fa69675913eede0db
--- 1/src/mds/Migrator.cc
--- 2/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@@ -1808,13 -1829,8 +1830,8 @@@ void Migrator::export_finish(CDir *dir
    // finish export (adjust local cache state)
    int num_dentries = 0;
    C_ContextsBase<MDSInternalContextBase, MDSInternalContextGather> *fin = new C_ContextsBase<MDSInternalContextBase, MDSInternalContextGather>(g_ceph_context);
 -  finish_export_dir(dir, ceph_clock_now(g_ceph_context), it->second.peer,
 +  finish_export_dir(dir, ceph_clock_now(), it->second.peer,
                    it->second.peer_imported, fin->contexts, &num_dentries);
-   dir->add_waiter(CDir::WAIT_UNFREEZE, fin);
- 
-   // unfreeze
-   dout(7) << "export_finish unfreezing" << dendl;
-   dir->unfreeze_tree();
    
    // unpin bounds
    set<CDir*> bounds;

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mds/SessionMap.h
Simple merge

diff --cc src/mds/StrayManager.cc
Simple merge

diff --cc src/mds/journal.cc
Simple merge

diff --cc src/messages/MMDSSlaveRequest.h
Simple merge