From 1f8b908d93a071d277e13115edcd9d0d9f701f48 Mon Sep 17 00:00:00 2001 From: chunmei Date: Thu, 6 Apr 2023 07:19:40 +0000 Subject: [PATCH] crimson/os: fix formatter build error Signed-off-by: chunmei (cherry picked from commit c401a4af889fb68468447453716059cb73eb405a) --- src/crimson/os/seastore/device.h | 1 + src/crimson/os/seastore/seastore_types.h | 1 + src/crimson/os/seastore/segment_manager/block.cc | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/crimson/os/seastore/device.h b/src/crimson/os/seastore/device.h index 2cdc5d02e9b..ceb1ede6453 100644 --- 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 : fmt::ostream_formatter {}; +template <> struct fmt::formatter : fmt::ostream_formatter {}; #endif diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h index 7ec1215a06f..99d17472eb3 100644 --- a/src/crimson/os/seastore/seastore_types.h +++ b/src/crimson/os/seastore/seastore_types.h @@ -2121,6 +2121,7 @@ template <> struct fmt::formatter : fmt::ost template <> struct fmt::formatter : fmt::ostream_formatter {}; template <> struct fmt::formatter : fmt::ostream_formatter {}; template <> struct fmt::formatter : fmt::ostream_formatter {}; +template <> struct fmt::formatter : fmt::ostream_formatter {}; template <> struct fmt::formatter : fmt::ostream_formatter {}; template <> struct fmt::formatter : fmt::ostream_formatter {}; template <> struct fmt::formatter : fmt::ostream_formatter {}; diff --git a/src/crimson/os/seastore/segment_manager/block.cc b/src/crimson/os/seastore/segment_manager/block.cc index ca1060d0981..4eb8d60b21c 100644 --- 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]); -- 2.39.5