From: John Spray <jspray@redhat.com>
Date: Thu, 19 Mar 2015 13:15:24 +0000 (+0000)
Subject: mds: fix error_str formatting in scrub output
X-Git-Tag: v9.0.0~133^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=640c235124a99dcb343393b6d60fd83e34fc9044;p=ceph.git

mds: fix error_str formatting in scrub output

operator<< on an ostringstream actually gets
you an address.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 8309c88e078..017cd4efacd 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3807,7 +3807,7 @@ void CInode::validated_data::dump(Formatter *f) const
       f->dump_int("read_ret_val", backtrace.ondisk_read_retval);
       f->dump_stream("ondisk_value") << backtrace.ondisk_value;
       f->dump_stream("memoryvalue") << backtrace.memory_value;
-      f->dump_stream("error_str") << backtrace.error_str;
+      f->dump_string("error_str", backtrace.error_str.str());
     }
     f->close_section(); // backtrace
     f->open_object_section("raw_rstats");
@@ -3817,7 +3817,7 @@ void CInode::validated_data::dump(Formatter *f) const
       f->dump_int("read_ret_val", raw_rstats.ondisk_read_retval);
       f->dump_stream("ondisk_value") << raw_rstats.ondisk_value;
       f->dump_stream("memory_value") << raw_rstats.memory_value;
-      f->dump_stream("error_str") << raw_rstats.error_str;
+      f->dump_string("error_str", raw_rstats.error_str.str());
     }
     f->close_section(); // raw_rstats
     // dump failure return code