From dc52581df5fefb8a9fdbedebc82e61794d07ab7a Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Tue, 4 Mar 2014 19:32:40 +0800 Subject: [PATCH] mds: properly initialize MDCache::fragment_info_t Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 4 ++-- src/mds/MDCache.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index f6eb3a37ef3e..e92513d6bfc4 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -11379,7 +11379,7 @@ void MDCache::find_stale_fragment_freeze() dirfrag_t df = p->first; fragment_info_t& info = p->second; ++p; - if (info.dirs_frozen) + if (info.has_frozen) continue; CDir *dir; int total_auth_pins = 0; @@ -11479,7 +11479,7 @@ void MDCache::fragment_frozen(dirfrag_t basedirfrag, int r) dout(10) << "fragment_frozen " << basedirfrag.frag << " by " << info.bits << " on " << info.dirs.front()->get_inode() << dendl; - info.dirs_frozen = true; + info.has_frozen = true; MDRequest *mdr = request_start_internal(CEPH_MDS_OP_FRAGMENTDIR); mdr->more()->fragment_base = basedirfrag; diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h index b3c5ad553587..c4a89ded8153 100644 --- a/src/mds/MDCache.h +++ b/src/mds/MDCache.h @@ -961,11 +961,11 @@ private: list resultfrags; MDRequest *mdr; // for deadlock detection - bool dirs_frozen; + bool has_frozen; utime_t last_cum_auth_pins_change; int last_cum_auth_pins; int num_remote_waiters; // number of remote authpin waiters - fragment_info_t() : last_cum_auth_pins(0), num_remote_waiters(0) {} + fragment_info_t() : has_frozen(false), last_cum_auth_pins(0), num_remote_waiters(0) {} }; map fragments; -- 2.47.3