From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Wed, 19 Mar 2014 08:20:21 +0000 (+0800)
Subject: mds: fix typo in MDCache::handle_cache_rejoin_strong
X-Git-Tag: v0.79~111^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1501%2Fhead;p=ceph.git

mds: fix typo in MDCache::handle_cache_rejoin_strong

It should invent dirfrags according to the dirfragtree

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 3415ad19b1d6..2d82d12dcadf 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -4440,7 +4440,7 @@ void MDCache::handle_cache_rejoin_strong(MMDSCacheRejoin *strong)
       for (list<frag_t>::iterator q = ls.begin(); q != ls.end(); ++q) {
 	CDir *dir = diri->get_dirfrag(*q);
 	if (!dir)
-	  dir = rejoin_invent_dirfrag(p->first);
+	  dir = rejoin_invent_dirfrag(dirfrag_t(diri->ino(), *q));
 	else
 	  dout(10) << " have(approx) " << *dir << dendl;
 	dir->add_replica(from, p->second.nonce);