]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: formatting nits 17497/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 31 Aug 2017 04:42:36 +0000 (12:42 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 5 Sep 2017 15:17:18 +0000 (17:17 +0200)
So we don't output anything if csum is currently off:

_do_alloc_write blob Blob(0x7fad7cc25950 blob([0x42a80000~10000] none/0x1)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 22740cc9b3e489ae82b4b3071a17793c11abce79)

src/os/bluestore/BlueStore.cc
src/os/bluestore/bluestore_types.cc

index cafe8c5685d310575e354e13db5335bd44933794..974313936460fa0b75e5a080ebb43b3d50b9f9c3 100644 (file)
@@ -9981,7 +9981,7 @@ int BlueStore::_do_alloc_write(
       if ((suggested_boff % (1 << csum_order)) == 0 &&
            suggested_boff + final_length <= max_bsize &&
            suggested_boff > b_off) {
-        dout(20) << __func__ << " forcing blob_offset to "
+        dout(20) << __func__ << " forcing blob_offset to 0x"
                  << std::hex << suggested_boff << std::dec << dendl;
         assert(suggested_boff >= b_off);
         csum_length += suggested_boff - b_off;
index 659f3e5bcc06823b35fa866b40c435988867829e..9fb7ce84b626f00bcc28fc5e9074600eddebf8f2 100644 (file)
@@ -674,7 +674,7 @@ ostream& operator<<(ostream& out, const bluestore_blob_t& o)
   if (o.flags) {
     out << " " << o.get_flags_string();
   }
-  if (o.csum_type) {
+  if (o.has_csum()) {
     out << " " << Checksummer::get_csum_type_string(o.csum_type)
        << "/0x" << std::hex << (1ull << o.csum_chunk_order) << std::dec;
   }