From: Kefu Chai <kchai@redhat.com>
Date: Sat, 23 May 2020 03:54:53 +0000 (+0800)
Subject: tools/cephfs/MetaTool: print buffer::error::what()
X-Git-Tag: v16.1.0~2254^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35204%2Fhead;p=ceph.git

tools/cephfs/MetaTool: print buffer::error::what()

* buffer::error does not offer operator<<(ostream&, const
  buffer::error&). so in this change, err.what() is used instead.
* also add spaces to follow our coding style convention.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/tools/cephfs/MetaTool.cc b/src/tools/cephfs/MetaTool.cc
index 52b3bc36e005..f5894e2f2073 100644
--- a/src/tools/cephfs/MetaTool.cc
+++ b/src/tools/cephfs/MetaTool.cc
@@ -392,7 +392,8 @@ int MetaTool::show_fn(meta_op &op){
     }
     return 0;
 }
-int MetaTool::_show_fn(inode_meta_t& inode_meta, const string& fn){
+int MetaTool::_show_fn(inode_meta_t& inode_meta, const string& fn)
+{
     std::list<frag_t> frags;
     inode_meta.get_meta()->dirfragtree.get_leaves(frags);
     std::stringstream ds;
@@ -414,12 +415,12 @@ int MetaTool::_show_fn(inode_meta_t& inode_meta, const string& fn){
             try {
                 auto p = hbl.cbegin();
                 ::decode(got_fnode, p);
-            }catch (const buffer::error &err){
+            } catch (const buffer::error &err) {
                 cerr << "corrupt fnode header in " << oid
-                     << ": " << err << std::endl;
+                     << ": " << err.what() << std::endl;
                 return -1;
             }
-            if (oids.size() != 0)
+            if (!oids.empty())
                 oids += ",";
             oids += oid;
             f->open_object_section(oid.c_str());