From: Sage Weil <sage@newdream.net>
Date: Thu, 28 Apr 2011 20:34:34 +0000 (-0700)
Subject: mds: make trim_non_auth paths complete filepaths (not dnames)
X-Git-Tag: v0.28~132^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e942a2a000686e2ed2429e746492bc3a26692bd1;p=ceph.git

mds: make trim_non_auth paths complete filepaths (not dnames)

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index a6896a057fb..600f513255c 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5486,7 +5486,9 @@ void MDCache::trim_non_auth()
 	in->get_dirfrags(ls);
 	for (list<CDir*>::iterator p = ls.begin(); p != ls.end(); ++p) {
 	  CDir *subdir = *p;
-	  warn_str_dirs << subdir->get_inode()->get_parent_dn()->get_name() << "\n";
+	  filepath fp;
+	  subdir->get_inode()->make_path(fp);
+	  warn_str_dirs << fp << "\n";
 	  if (subdir->is_subtree_root()) 
 	    remove_subtree(subdir);
 	  in->close_dirfrag(subdir->dirfrag().frag);
@@ -5529,8 +5531,9 @@ void MDCache::trim_non_auth()
 	     ++p) {
 	  dout(0) << " ... " << **p << dendl;
 	  CInode *diri = (*p)->get_inode();
-	  if (!diri->is_base())
-	    warn_str_dirs << diri->get_parent_dn()->get_name() << "\n";
+	  filepath fp;
+	  diri->make_path(fp);
+	  warn_str_dirs << fp << "\n";
 	  assert((*p)->get_num_ref() == 1);  // SUBTREE
 	  remove_subtree((*p));
 	  in->close_dirfrag((*p)->dirfrag().frag);