Merge pull request #15125 from ukernel/wip-multimds-misc2

mds: miscellaneous multimds fixes part2

Reviewed-by: John Spray <john.spray@redhat.com>

diff --cc src/mds/MDCache.cc
index b03e0ac4aae595b2e5e43d27b7c993a8b902582f,e3ada0b1672cf17f2e0fa6d297625968e7613212..0c6f322f7731bc38a7975ec39a4ebdf448404143
--- 1/src/mds/MDCache.cc
--- 2/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@@ -10755,8 -10792,9 +10793,8 @@@ void MDCache::adjust_dir_fragments(CIno
      // merge
      CDir *f = new CDir(diri, basefrag, this, srcfrags.front()->is_auth());
      f->merge(srcfrags, waiters, replay);
 -    diri->add_dirfrag(f);
  
-     if (was_subtree) {
+     if (any_subtree) {
        assert(f->is_subtree_root());
        subtrees[f].swap(new_bounds);
        if (parent_subtree)

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

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