mds: dump frag_t as an object

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 1d526c50de0712a180db1b6fa39ae6f51e346c3c)

Conflicts:
    src/mds/mdstypes.h: add dump method

diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
index e59aa5fc95b9bf059241ea9ebbdf1458205cdd4f..e66b5fe1cda326c093f8e48c11626b530c48be17 100644 (file)
--- a/src/mds/mdstypes.cc
+++ b/src/mds/mdstypes.cc
@@ -753,7 +753,7 @@ void MDSCacheObjectInfo::decode(bufferlist::const_iterator& p)
 void MDSCacheObjectInfo::dump(Formatter *f) const
 {
   f->dump_unsigned("ino", ino);
-  f->dump_stream("dirfrag") << dirfrag;
+  f->dump_object("dirfrag", dirfrag);
   f->dump_string("name", dname);
   f->dump_unsigned("snapid", snapid);
 }

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 649f13b7df0b83ca2121ad61996bd776faae1a1c..ead42242cb63b14e3199a3dc90d7cbd052715a8d 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -776,6 +776,11 @@ struct dirfrag_t {
     }
   }
 
+  void dump(ceph::Formatter *f) const {
+    f->dump_unsigned("ino", ino);
+    f->dump_unsigned("frag", frag);
+  }
+
   void encode(ceph::buffer::list& bl) const {
     using ceph::encode;
     encode(ino, bl);