From bdcf9d9a2c8c0b8ce68beef025401ef0dd179192 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 20 Apr 2018 11:00:37 -0400 Subject: [PATCH] rbd: correct object size formatting Signed-off-by: Jason Dillaman --- src/tools/rbd/action/Info.cc | 2 +- src/tools/rbd/action/Journal.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd/action/Info.cc b/src/tools/rbd/action/Info.cc index 74ef953283711..0cd29ca67e86b 100644 --- a/src/tools/rbd/action/Info.cc +++ b/src/tools/rbd/action/Info.cc @@ -208,7 +208,7 @@ static int do_show_info(librados::IoCtx &io_ctx, librbd::Image& image, << info.num_objs << " objects" << std::endl << "\torder " << info.order - << " (" << si_u_t(info.obj_size) << " objects)" + << " (" << byte_u_t(info.obj_size) << " objects)" << std::endl; if (!imgid.empty()) { std::cout << "\tid: " << imgid << std::endl; diff --git a/src/tools/rbd/action/Journal.cc b/src/tools/rbd/action/Journal.cc index a189d59631cf5..7f155a87c2e08 100644 --- a/src/tools/rbd/action/Journal.cc +++ b/src/tools/rbd/action/Journal.cc @@ -78,7 +78,7 @@ static int do_show_journal_info(librados::Rados& rados, librados::IoCtx& io_ctx, std::cout << "\theader_oid: " << header_oid << std::endl; std::cout << "\tobject_oid_prefix: " << object_oid_prefix << std::endl; std::cout << "\torder: " << static_cast(order) << " (" - << si_u_t(1ull << order) << " objects)"<< std::endl; + << byte_u_t(1ull << order) << " objects)"<< std::endl; std::cout << "\tsplay_width: " << static_cast(splay_width) << std::endl; if (!object_pool_name.empty()) { std::cout << "\tobject_pool: " << object_pool_name << std::endl; -- 2.39.5