From: Sage Weil <sage@newdream.net>
Date: Tue, 7 Dec 2010 20:45:04 +0000 (-0800)
Subject: mds: small rejoin cleanup
X-Git-Tag: v0.24~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3825c4b87bade2018e5b7b6a2c1da76790a712a0;p=ceph.git

mds: small rejoin cleanup

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 52e48fd650ff..7977d87136d5 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -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