cfixups. niceify object_t printing

diff --git a/src/client/Client.h b/src/client/Client.h
index b62997a1f1b512980a2f4daf30d123197f228165..50daad6bf9312c3fdcdaaf35d41bbfe36205b8e1 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -580,10 +580,8 @@ protected:
 
   SnapRealm *get_snap_realm(inodeno_t r, vector<snapid_t> &snaps) {
     SnapRealm *realm = snap_realms[r];
-    if (!realm) {
-      new SnapRealm(r, snaps);
-      snap_realms[r] = realm;
-    }
+    if (!realm)
+      snap_realms[r] = realm = new SnapRealm(r, snaps);
     realm->nref++;
     return realm;
   }

diff --git a/src/include/object.h b/src/include/object.h
index 3513af880c76d1965385cd5eb96308b93e9cbc1f..6475c77ff17dcbef8b1922a8fc1fb1f494850fc4 100644 (file)
--- a/src/include/object.h
+++ b/src/include/object.h
@@ -101,8 +101,12 @@ inline ostream& operator<<(ostream& out, const object_t o) {
   out.fill('0');
   out << setw(8) << o.bno << dec;
   out.unsetf(ios::right);
-  if (o.snap) 
-    out << '.' << o.snap;
+  if (o.snap) {
+    if (o.snap == CEPH_NOSNAP)
+      out << ".head";
+    else
+      out << '.' << o.snap;
+  }
   return out;
 }
 

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index cec3c529e31d82fa206925b0690006bd34b2b2f6..7e49b632ec244180258d1ed2761a019a9b77f494 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -988,11 +988,13 @@ SnapRealm *CInode::find_containing_snaprealm()
 {
   CInode *cur = this;
   while (1) {
-    if (!cur->get_parent_dn())
+    if (!cur->get_parent_dn()) {
+      assert(0); // all base inodes should have realms!
       return 0;
+    }
     cur = cur->get_parent_dn()->get_dir()->get_inode();
     if (cur->snaprealm)
-      return snaprealm;
+      return cur->snaprealm;
   }
 }