From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Tue, 12 Mar 2013 12:51:43 +0000 (+0800)
Subject: mds: don't open dirfrag while subtree is frozen
X-Git-Tag: v0.62~120^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1602b3b7eebedc7ffc9d37fad3bd22b5f5b7df8;p=ceph.git

mds: don't open dirfrag while subtree is frozen

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index ac922ed69f9e..4c534d06ebc8 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -7094,9 +7094,9 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req, Context *fin,     // wh
     if (!curdir) {
       if (cur->is_auth()) {
         // parent dir frozen_dir?
-        if (cur->is_frozen_dir()) {
-          dout(7) << "traverse: " << *cur->get_parent_dir() << " is frozen_dir, waiting" << dendl;
-          cur->get_parent_dn()->get_dir()->add_waiter(CDir::WAIT_UNFREEZE, _get_waiter(mdr, req, fin));
+        if (cur->is_frozen()) {
+          dout(7) << "traverse: " << *cur << " is frozen, waiting" << dendl;
+          cur->add_waiter(CDir::WAIT_UNFREEZE, _get_waiter(mdr, req, fin));
           return 1;
         }
         curdir = cur->get_or_open_dirfrag(this, fg);