]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix typo in MDCache::handle_cache_rejoin_strong 1501/head
authorYan, Zheng <zheng.z.yan@intel.com>
Wed, 19 Mar 2014 08:20:21 +0000 (16:20 +0800)
committerYan, Zheng <zheng.z.yan@intel.com>
Wed, 19 Mar 2014 08:25:26 +0000 (16:25 +0800)
It should invent dirfrags according to the dirfragtree

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
src/mds/MDCache.cc

index 3415ad19b1d6dd3548b45a0672998ffb75a20f56..2d82d12dcadf8b31077e15456f351cecef1c0e51 100644 (file)
@@ -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);