From 8cb238785cec30e4941fd0bbbf7286a4bfafb94c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 3 Aug 2008 14:52:39 -0700 Subject: [PATCH] mds: fix open_remote_ino freeze_dir check --- src/mds/MDCache.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 1ccb4298a7673..73d598753f36d 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -5621,15 +5621,15 @@ void MDCache::open_remote_ino_2(inodeno_t ino, } if (!dir && in->is_auth()) { - if (dir->is_frozen_dir()) { - dout(7) << "traverse: " << *dir << " is frozen_dir, waiting" << dendl; - dir->add_waiter(CDir::WAIT_UNFREEZE, onfinish); + if (in->is_frozen_dir()) { + dout(7) << "traverse: " << *in << " is frozen_dir, waiting" << dendl; + in->parent->dir->add_waiter(CDir::WAIT_UNFREEZE, onfinish); return; } dir = in->get_or_open_dirfrag(this, frag); } - assert(dir); + if (dir->is_auth()) { if (dir->is_complete()) { // hrm. requery anchor table. -- 2.39.5