rbd: correct object size formatting

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit bdcf9d9a2c8c0b8ce68beef025401ef0dd179192)

diff --git a/src/tools/rbd/action/Info.cc b/src/tools/rbd/action/Info.cc
index 33b757bc7aeaf8326648211373cf98f340801657..62dd9086a308c48de2b2a46902eff7355918828e 100644 (file)
--- a/src/tools/rbd/action/Info.cc
+++ b/src/tools/rbd/action/Info.cc
@@ -163,7 +163,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 (!data_pool.empty()) {
       std::cout << "\tdata_pool: " << data_pool << std::endl;

diff --git a/src/tools/rbd/action/Journal.cc b/src/tools/rbd/action/Journal.cc
index 7921ace2410814fd4e1da76bcf7fb77491cc2d5b..20868721e08b16a79d5056f0835cb00c276cc65e 100644 (file)
--- 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<int>(order) << " ("
-             << si_u_t(1ull << order) << " objects)"<< std::endl;
+             << byte_u_t(1ull << order) << " objects)"<< std::endl;
     std::cout << "\tsplay_width: " << static_cast<int>(splay_width) << std::endl;
     if (!object_pool_name.empty()) {
       std::cout << "\tobject_pool: " << object_pool_name << std::endl;