From 22740cc9b3e489ae82b4b3071a17793c11abce79 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 31 Aug 2017 12:42:36 +0800 Subject: [PATCH] os/bluestore: formatting nits 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 --- src/os/bluestore/BlueStore.cc | 2 +- src/os/bluestore/bluestore_types.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index b4003b5b417..f3cbca7131d 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -9923,7 +9923,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; diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc index 659f3e5bcc0..9fb7ce84b62 100644 --- a/src/os/bluestore/bluestore_types.cc +++ b/src/os/bluestore/bluestore_types.cc @@ -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; } -- 2.39.5