From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 16:26:40 +0000 (-0700)
Subject: mds: clean up get_or_create_stray
X-Git-Tag: v0.29~42^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cea7b65182f4199284d6742a9850860b90f63140;p=ceph.git

mds: clean up get_or_create_stray

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 912e1dd24ef65..c138f39425b16 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -630,13 +630,11 @@ CDentry *MDCache::get_or_create_stray_dentry(CInode *in)
 {
   string straydname;
   in->name_stray_dentry(straydname);
-  
-  assert(get_stray());
-
-  frag_t fg = get_stray()->pick_dirfrag(straydname);
 
-  CDir *straydir = get_stray()->get_or_open_dirfrag(this, fg);
-  
+  CInode *strayi = get_stray();
+  assert(strayi);
+  frag_t fg = strayi->pick_dirfrag(straydname);
+  CDir *straydir = strayi->get_or_open_dirfrag(this, fg);
   CDentry *straydn = straydir->lookup(straydname);
   if (!straydn) {
     straydn = straydir->add_null_dentry(straydname);