crimson/os: fix formatter build error

Signed-off-by: chunmei <chunmei.liu@intel.com>
(cherry picked from commit c401a4af889fb68468447453716059cb73eb405a)

diff --git a/src/crimson/os/seastore/device.h b/src/crimson/os/seastore/device.h
index 2cdc5d02e9bf694e1e62d34b0bbd206c8fdbb155..ceb1ede64531f4e1a12ef5f1b6f13e598ef4c347 100644 (file)
--- a/src/crimson/os/seastore/device.h
+++ b/src/crimson/os/seastore/device.h
@@ -171,4 +171,5 @@ WRITE_CLASS_DENC(crimson::os::seastore::device_config_t)
 
 #if FMT_VERSION >= 90000
 template <> struct fmt::formatter<crimson::os::seastore::device_config_t> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<crimson::os::seastore::device_spec_t> : fmt::ostream_formatter {};
 #endif

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 7ec1215a06f5aa5dcb2b2bab5034ba439bc8a272..99d17472eb3c9bda75e4dc105574158cd27e5bdc 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -2121,6 +2121,7 @@ template <> struct fmt::formatter<crimson::os::seastore::omap_root_t> : fmt::ost
 template <> struct fmt::formatter<crimson::os::seastore::paddr_list_t> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<crimson::os::seastore::paddr_t> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<crimson::os::seastore::placement_hint_t> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<crimson::os::seastore::device_type_t> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<crimson::os::seastore::record_group_header_t> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<crimson::os::seastore::record_group_size_t> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<crimson::os::seastore::record_header_t> : fmt::ostream_formatter {};

diff --git a/src/crimson/os/seastore/segment_manager/block.cc b/src/crimson/os/seastore/segment_manager/block.cc
index ca1060d09816d00382b1855beba0c658f9f9f6d2..4eb8d60b21c3b31824096dbc531da462f92d82ea 100644 (file)
--- a/src/crimson/os/seastore/segment_manager/block.cc
+++ b/src/crimson/os/seastore/segment_manager/block.cc
@@ -233,7 +233,7 @@ block_sm_superblock_t make_superblock(
   INFO("{} disk_size={}, segment_size={}, block_size={}",
        device_id_printer_t{device_id},
        size,
-       config_segment_size,
+       uint64_t(config_segment_size),
        data.block_size);
   for (unsigned int i = 0; i < seastar::smp::count; i++) {
     INFO("shard {} infos:", i, shard_infos[i]);