From: Sage Weil <sage@newdream.net>
Date: Fri, 18 Jul 2008 16:47:30 +0000 (-0700)
Subject: mds: small snap fix
X-Git-Tag: v0.4~437
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a522c1fdac5ba11e632d9d01451f730bca2300c6;p=ceph.git

mds: small snap fix
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index fd9dbb102af7..c5f7e1b25be9 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -49,11 +49,11 @@ ostream& operator<<(ostream& out, CInode& in)
 {
   filepath path;
   in.make_path(path);
-  out << "[inode " << in.inode.ino << " " << path << (in.is_dir() ? "/":"");
-  if (in.is_multiversion())
-    out << " [" << in.first << ",...]";
-  else 
-    out << " [" << in.first << "," << in.last << "]";
+  out << "[inode " << in.inode.ino;
+  out << " [" 
+      << (in.is_multiversion() ? "...":"")
+      << in.first << "," << in.last << "]";
+  out << " " << path << (in.is_dir() ? "/":"");
 
   if (in.is_auth()) {
     out << " auth";
diff --git a/src/mds/snap.cc b/src/mds/snap.cc
index de0c2798bcf9..14dd274dec09 100644
--- a/src/mds/snap.cc
+++ b/src/mds/snap.cc
@@ -127,10 +127,8 @@ const vector<snapid_t>& SnapRealm::get_snap_vector()
 
 const set<snapid_t>& SnapRealm::update_snaps(snapid_t creating)
 {
-  if (!snap_highwater) {
-    assert(cached_snaps.empty());
-    get_snaps();
-  }
+  get_snaps();
+
   snap_highwater = creating;
   cached_snaps.insert(creating);
   cached_snap_vec.insert(cached_snap_vec.begin(), creating);