Merge PR 16041 into master

* refs/remotes/upstream/pull/16041/head:
	mds: “*dir” print repeatedly
	MDS: tick_event repeated assignment

Reviewed-by: Zheng Yan <zyan@redhat.com>

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

diff --cc src/mds/Server.cc
index 5fe300a7197c0d9f1f9cd8b60f0174a318c374ea,84c6b8127172c1f3296d3b0f36c13fa9b0180b7c..58b4e2d40757704a8873951a5b1c946f1bd7d541
--- 1/src/mds/Server.cc
--- 2/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@@ -2851,8 -2629,14 +2851,7 @@@ CDentry* Server::rdlock_path_xlock_dent
  
    CDir *dir = traverse_to_auth_dir(mdr, mdr->dn[n], refpath);
    if (!dir) return 0;
-   dout(10) << "rdlock_path_xlock_dentry dir " << *dir << dendl;
  
 -  // make sure we can auth_pin (or have already authpinned) dir
 -  if (dir->is_frozen()) {
 -    dout(7) << "waiting for !frozen/authpinnable on " << *dir << dendl;
 -    dir->add_waiter(CInode::WAIT_UNFREEZE, new C_MDS_RetryRequest(mdcache, mdr));
 -    return 0;
 -  }
 -
    CInode *diri = dir->get_inode();
    if (!mdr->reqid.name.is_mds()) {
      if (diri->is_system() && !diri->is_root()) {