From d11672db829d9e678fe6ac31b35929350699546a Mon Sep 17 00:00:00 2001
From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 26 Apr 2019 11:03:53 -0700
Subject: [PATCH] common, osd: remove erroneous 'section' in dump functions

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---
 src/include/utime.cc | 2 --
 src/include/uuid.cc  | 6 +-----
 src/osd/osd_types.h  | 9 ++-------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/include/utime.cc b/src/include/utime.cc
index 0afc1d585a1..2252a1ca4fd 100644
--- a/src/include/utime.cc
+++ b/src/include/utime.cc
@@ -17,10 +17,8 @@
 
 void utime_t::dump(ceph::Formatter *f) const
 {
-  f->open_object_section("utime");
   f->dump_int("seconds", tv.tv_sec);
   f->dump_int("nanoseconds", tv.tv_nsec);
-  f->close_section();
 }
 
 void utime_t::generate_test_instances(std::list<utime_t*>& o)
diff --git a/src/include/uuid.cc b/src/include/uuid.cc
index 2d1eb196219..106fc1db586 100644
--- a/src/include/uuid.cc
+++ b/src/include/uuid.cc
@@ -17,11 +17,7 @@
 
 void uuid_d::dump(ceph::Formatter *f) const
 {
-  f->open_object_section("uuid_d");
-  {
-    f->dump_stream("uuid") << to_string();
-  }
-  f->close_section();
+  f->dump_stream("uuid") << to_string();
 }
 
 void uuid_d::generate_test_instances(std::list<uuid_d*>& o)
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 6b0a3ced15c..c0b9cf65d90 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -5624,7 +5624,7 @@ struct watch_item_t {
     }
     DECODE_FINISH(bl);
   }
-  void dump_bare(ceph::Formatter *f) const {
+  void dump(ceph::Formatter *f) const {
     f->dump_stream("watcher") << name;
     f->dump_int("cookie", cookie);
     f->dump_int("timeout", timeout_seconds);
@@ -5632,11 +5632,6 @@ struct watch_item_t {
     addr.dump(f);
     f->close_section();
   }
-  void dump(ceph::Formatter *f) const {
-    f->open_object_section("watch_item_t");
-    dump_bare(f);
-    f->close_section();
-  }
   static void generate_test_instances(std::list<watch_item_t*>& o) {
     entity_addr_t ea;
     ea.set_type(entity_addr_t::TYPE_LEGACY);
@@ -5682,7 +5677,7 @@ struct obj_list_watch_response_t {
     f->open_array_section("entries");
     for (std::list<watch_item_t>::const_iterator p = entries.begin(); p != entries.end(); ++p) {
       f->open_object_section("watch");
-      p->dump_bare(f);
+      p->dump(f);
       f->close_section();
     }
     f->close_section();
-- 
2.47.3