From: Sage Weil <sage@newdream.net>
Date: Fri, 26 Jun 2009 23:50:00 +0000 (-0700)
Subject: mds: don't choke on path_traverse_to_dir that fully exists
X-Git-Tag: v0.10~105
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f7ef163c0fbf1a13db243b2f69f78b4aa5eb666;p=ceph.git

mds: don't choke on path_traverse_to_dir that fully exists
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 8141f6d990e4..6e80413cbac3 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5857,8 +5857,8 @@ bool MDCache::path_is_mine(filepath& path)
  *
  * @path - path to traverse (as far as we can)
  *
- * assumes we _don't_ have the full path.  (if we do, we throw an assertion.)
- * assumes that we are path for the path (we open dirfrags willy-nilly).
+ * usually we _don't_ have the full path.  (if we do, we return NULL.)
+ * also, if path calls a file a dir, we return NULL.
  */
 CDir *MDCache::path_traverse_to_dir(filepath& path)
 {
@@ -5878,8 +5878,9 @@ CDir *MDCache::path_traverse_to_dir(filepath& path)
     assert(dnl->is_primary());
     cur = dnl->get_inode();
   }
-  assert(0);
-  //return NULL; // oh, we have the full path.
+
+  // hmm, we DO have the full path.
+  return NULL;
 }