From c9f038a08a958f9a806e101d79e40c1b15c88e8f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 28 Apr 2025 08:22:04 +0200 Subject: [PATCH] tools: add missing includes Signed-off-by: Max Kellermann --- src/tools/ceph_dedup/ceph_dedup_daemon.cc | 1 + src/tools/ceph_dedup/ceph_dedup_tool.cc | 1 + src/tools/cephfs_mirror/Watcher.cc | 1 + src/tools/cephfs_mirror/watcher/RewatchRequest.cc | 1 + src/tools/rados/rados.cc | 1 + src/tools/radosacl.cc | 2 ++ src/tools/rbd/action/Bench.cc | 1 + src/tools/rbd/action/Clone.cc | 1 + src/tools/rbd/action/DiskUsage.cc | 1 + src/tools/rbd/action/Info.cc | 3 ++- src/tools/rbd/action/Journal.cc | 1 + src/tools/rbd/action/Snap.cc | 3 ++- src/tools/rbd/action/Status.cc | 1 + src/tools/rbd_mirror/Mirror.cc | 1 + src/tools/rbd_mirror/Throttler.cc | 1 + src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc | 1 + src/tools/rbd_mirror/image_replayer/journal/Replayer.cc | 1 + src/tools/scratchtoolpp.cc | 2 +- 18 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/tools/ceph_dedup/ceph_dedup_daemon.cc b/src/tools/ceph_dedup/ceph_dedup_daemon.cc index a82b0227b32..52fec5ee129 100644 --- a/src/tools/ceph_dedup/ceph_dedup_daemon.cc +++ b/src/tools/ceph_dedup/ceph_dedup_daemon.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "common.h" +#include "common/Clock.h" // for ceph_clock_now() #include "log/Log.h" #include // for std::shared_lock diff --git a/src/tools/ceph_dedup/ceph_dedup_tool.cc b/src/tools/ceph_dedup/ceph_dedup_tool.cc index 31a4eb8f8bd..b7c8c5132ab 100644 --- a/src/tools/ceph_dedup/ceph_dedup_tool.cc +++ b/src/tools/ceph_dedup/ceph_dedup_tool.cc @@ -13,6 +13,7 @@ */ #include "common.h" +#include "common/Clock.h" // for ceph_clock_now() #include "log/Log.h" #include diff --git a/src/tools/cephfs_mirror/Watcher.cc b/src/tools/cephfs_mirror/Watcher.cc index 1445fce5f23..df026449a84 100644 --- a/src/tools/cephfs_mirror/Watcher.cc +++ b/src/tools/cephfs_mirror/Watcher.cc @@ -5,6 +5,7 @@ #include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" +#include "include/rados.h" // for EBLOCKLISTED #include "include/stringify.h" #include "aio_utils.h" #include "watcher/RewatchRequest.h" diff --git a/src/tools/cephfs_mirror/watcher/RewatchRequest.cc b/src/tools/cephfs_mirror/watcher/RewatchRequest.cc index 3070e6f8b01..07c6903a8f1 100644 --- a/src/tools/cephfs_mirror/watcher/RewatchRequest.cc +++ b/src/tools/cephfs_mirror/watcher/RewatchRequest.cc @@ -5,6 +5,7 @@ #include "common/debug.h" #include "common/errno.h" #include "include/Context.h" +#include "include/rados.h" // for EBLOCKLISTED #include "tools/cephfs_mirror/aio_utils.h" #include "RewatchRequest.h" diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 9781a174d0f..91408b92c2a 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -24,6 +24,7 @@ using namespace libradosstriper; #endif +#include "common/Clock.h" // for ceph_clock_now() #include "common/config.h" #include "common/ceph_argparse.h" #include "global/global_init.h" diff --git a/src/tools/radosacl.cc b/src/tools/radosacl.cc index a6c9b9f8dc4..8b0bea5f30e 100644 --- a/src/tools/radosacl.cc +++ b/src/tools/radosacl.cc @@ -18,6 +18,8 @@ #include // for std::cerr +#include "include/encoding.h" +#include "include/int_types.h" // for __u32 #include "include/types.h" #include "include/rados/librados.hpp" diff --git a/src/tools/rbd/action/Bench.cc b/src/tools/rbd/action/Bench.cc index d4c7a037489..49933b1ff4e 100644 --- a/src/tools/rbd/action/Bench.cc +++ b/src/tools/rbd/action/Bench.cc @@ -4,6 +4,7 @@ #include "tools/rbd/ArgumentTypes.h" #include "tools/rbd/Shell.h" #include "tools/rbd/Utils.h" +#include "common/ceph_time.h" // for coarse_mono_time() #include "common/errno.h" #include "common/strtol.h" #include "common/ceph_mutex.h" diff --git a/src/tools/rbd/action/Clone.cc b/src/tools/rbd/action/Clone.cc index 874024f482b..89e04f9659f 100644 --- a/src/tools/rbd/action/Clone.cc +++ b/src/tools/rbd/action/Clone.cc @@ -6,6 +6,7 @@ #include "tools/rbd/Utils.h" #include "include/types.h" #include "common/errno.h" +#include "include/rados.h" // for CEPH_NOSNAP #include #include diff --git a/src/tools/rbd/action/DiskUsage.cc b/src/tools/rbd/action/DiskUsage.cc index 12fb8cfde96..46288a4ccdc 100644 --- a/src/tools/rbd/action/DiskUsage.cc +++ b/src/tools/rbd/action/DiskUsage.cc @@ -4,6 +4,7 @@ #include "tools/rbd/ArgumentTypes.h" #include "tools/rbd/Shell.h" #include "tools/rbd/Utils.h" +#include "include/rados.h" // for CEPH_NOSNAP #include "include/types.h" #include "include/stringify.h" #include "common/errno.h" diff --git a/src/tools/rbd/action/Info.cc b/src/tools/rbd/action/Info.cc index f8d053cd76d..8c9377520db 100644 --- a/src/tools/rbd/action/Info.cc +++ b/src/tools/rbd/action/Info.cc @@ -4,8 +4,9 @@ #include "tools/rbd/ArgumentTypes.h" #include "tools/rbd/Shell.h" #include "tools/rbd/Utils.h" -#include "include/types.h" +#include "include/rbd_types.h" // for RBD_GROUP_INVALID_POOL #include "include/stringify.h" +#include "include/types.h" // for byte_u_t #include "common/errno.h" #include "common/Formatter.h" #include diff --git a/src/tools/rbd/action/Journal.cc b/src/tools/rbd/action/Journal.cc index 08606fcc365..a7069ab6687 100644 --- a/src/tools/rbd/action/Journal.cc +++ b/src/tools/rbd/action/Journal.cc @@ -9,6 +9,7 @@ #include "common/ceph_json.h" #include "common/errno.h" #include "common/safe_io.h" +#include "include/rbd_types.h" // for RBD_DIRECTORY #include "include/stringify.h" #include #include diff --git a/src/tools/rbd/action/Snap.cc b/src/tools/rbd/action/Snap.cc index 5f85f5d127d..f27b71dbb50 100644 --- a/src/tools/rbd/action/Snap.cc +++ b/src/tools/rbd/action/Snap.cc @@ -4,8 +4,9 @@ #include "tools/rbd/ArgumentTypes.h" #include "tools/rbd/Shell.h" #include "tools/rbd/Utils.h" -#include "include/types.h" +#include "include/rados.h" // for CEPH_NOSNAP #include "include/stringify.h" +#include "include/types.h" // for byte_u_t #include "common/errno.h" #include "common/Formatter.h" #include "common/TextTable.h" diff --git a/src/tools/rbd/action/Status.cc b/src/tools/rbd/action/Status.cc index 958a686c416..18b7cdb160c 100644 --- a/src/tools/rbd/action/Status.cc +++ b/src/tools/rbd/action/Status.cc @@ -9,6 +9,7 @@ #include "tools/rbd/Utils.h" #include "include/rbd_types.h" #include "include/stringify.h" +#include "include/types.h" // for byte_u_t #include "librbd/cache/Types.h" #include #include diff --git a/src/tools/rbd_mirror/Mirror.cc b/src/tools/rbd_mirror/Mirror.cc index 1328bfffe06..eaaa21c88c3 100644 --- a/src/tools/rbd_mirror/Mirror.cc +++ b/src/tools/rbd_mirror/Mirror.cc @@ -10,6 +10,7 @@ #include "common/admin_socket.h" #include "common/debug.h" #include "common/errno.h" +#include "include/intarith.h" // for p2roundup() #include "journal/Types.h" #include "librbd/ImageCtx.h" #include "perfglue/heap_profiler.h" diff --git a/src/tools/rbd_mirror/Throttler.cc b/src/tools/rbd_mirror/Throttler.cc index 690f95c9f01..b652f24f364 100644 --- a/src/tools/rbd_mirror/Throttler.cc +++ b/src/tools/rbd_mirror/Throttler.cc @@ -16,6 +16,7 @@ #include "common/Formatter.h" #include "common/debug.h" #include "common/errno.h" +#include "include/types.h" // for operator<<(std::pair) #include "librbd/Utils.h" #define dout_context g_ceph_context diff --git a/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc b/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc index e53923ef387..ede4ac08f97 100644 --- a/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc +++ b/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc @@ -4,6 +4,7 @@ #include "tools/rbd_mirror/image_deleter/TrashMoveRequest.h" #include "include/rbd_types.h" #include "cls/rbd/cls_rbd_client.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" diff --git a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc index d052536cc38..64e924e265b 100644 --- a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc +++ b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "Replayer.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/debug.h" #include "common/errno.h" #include "common/perf_counters.h" diff --git a/src/tools/scratchtoolpp.cc b/src/tools/scratchtoolpp.cc index 0794e42f4bc..6e0981ab265 100644 --- a/src/tools/scratchtoolpp.cc +++ b/src/tools/scratchtoolpp.cc @@ -12,7 +12,7 @@ * */ -#include "include/types.h" +#include "include/rados.h" // for CEPH_OSD_CMPXATTR_OP_EQ #include "include/rados/librados.hpp" using namespace librados; -- 2.39.5