Merge PR #17456 into master

* refs/remotes/upstream/pull/17456/head:
	mds: print subtrees only after merge

Reviewed-by: Zheng Yan <zyan@redhat.com>
This commit is contained in:
Patrick Donnelly 2017-09-08 11:23:17 -07:00
commit 5f99d9d53c
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -951,9 +951,9 @@ void MDCache::try_subtree_merge_at(CDir *dir, set<CInode*> *to_eval)
if (to_eval && dir->get_inode()->is_auth())
to_eval->insert(dir->get_inode());
}
show_subtrees(15);
show_subtrees(15);
}
}
void MDCache::subtree_merge_writebehind_finish(CInode *in, MutationRef& mut)