From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 Jul 2017 05:33:43 +0000 (-0700)
Subject: Merge PR 16041 into master
X-Git-Tag: ses5-milestone9~1^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2f6ae4726c339f10f71d2569535a220e3392b5ee;p=ceph.git

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>
---

2f6ae4726c339f10f71d2569535a220e3392b5ee
diff --cc src/mds/Server.cc
index 5fe300a7197,84c6b812717..58b4e2d4075
--- a/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()) {