]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: small rejoin cleanup
authorSage Weil <sage@newdream.net>
Tue, 7 Dec 2010 20:45:04 +0000 (12:45 -0800)
committerSage Weil <sage@newdream.net>
Wed, 8 Dec 2010 00:44:18 +0000 (16:44 -0800)
Signed-off-by: Sage Weil <sage@newdream.net>
src/mds/MDCache.cc

index 52e48fd650fffa1b5a6a97948591797f665388f7..7977d87136d58fe96536cf7ba6f4290f238c1d01 100644 (file)
@@ -3154,9 +3154,10 @@ void MDCache::rejoin_walk(CDir *dir, MMDSCacheRejoin *rejoin)
       CDentry::linkage_t *dnl = dn->get_linkage();
       dout(15) << " add_weak_primary_dentry " << *dn << dendl;
       assert(dnl->is_primary());
+      CInode *in = dnl->get_inode();
       assert(dnl->get_inode()->is_dir());
-      rejoin->add_weak_primary_dentry(dir->dirfrag(), dn->name.c_str(), dn->first, dn->last, dnl->get_inode()->ino());
-      dnl->get_inode()->get_nested_dirfrags(nested);
+      rejoin->add_weak_primary_dentry(dir->dirfrag(), dn->name.c_str(), dn->first, dn->last, in->ino());
+      in->get_nested_dirfrags(nested);
     }
   } else {
     // STRONG