From: Max Kellermann Date: Mon, 28 Oct 2024 08:17:15 +0000 (+0100) Subject: librbd: add missing includes X-Git-Tag: v20.0.0~137^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F61793%2Fhead;p=ceph.git librbd: add missing includes Signed-off-by: Max Kellermann --- diff --git a/src/librbd/AsyncObjectThrottle.cc b/src/librbd/AsyncObjectThrottle.cc index e0fcefff18a..655c36d28e7 100644 --- a/src/librbd/AsyncObjectThrottle.cc +++ b/src/librbd/AsyncObjectThrottle.cc @@ -6,6 +6,8 @@ #include "librbd/Utils.h" #include "librbd/asio/ContextWQ.h" +#include // for std::shared_lock + namespace librbd { diff --git a/src/librbd/ConfigWatcher.cc b/src/librbd/ConfigWatcher.cc index 0e412780438..6c13cbf4c75 100644 --- a/src/librbd/ConfigWatcher.cc +++ b/src/librbd/ConfigWatcher.cc @@ -13,6 +13,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::ConfigWatcher: " \ diff --git a/src/librbd/DeepCopyRequest.cc b/src/librbd/DeepCopyRequest.cc index af26ef0c9d7..e6e3b3a4d38 100644 --- a/src/librbd/DeepCopyRequest.cc +++ b/src/librbd/DeepCopyRequest.cc @@ -12,6 +12,8 @@ #include "librbd/deep_copy/SnapshotCopyRequest.h" #include "librbd/internal.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::DeepCopyRequest: " \ diff --git a/src/librbd/ExclusiveLock.cc b/src/librbd/ExclusiveLock.cc index bc148b1f5cd..b7fcf3fbc2e 100644 --- a/src/librbd/ExclusiveLock.cc +++ b/src/librbd/ExclusiveLock.cc @@ -14,7 +14,9 @@ #include "librbd/Utils.h" #include "librbd/asio/ContextWQ.h" #include "common/ceph_mutex.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/dout.h" +#include "common/perf_counters.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc index 7d3016abef1..0842ba3d56a 100644 --- a/src/librbd/ImageCtx.cc +++ b/src/librbd/ImageCtx.cc @@ -44,6 +44,8 @@ #include "osdc/Striper.h" #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::ImageCtx: " diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc index 7dd3d529831..69e8403af83 100644 --- a/src/librbd/ImageWatcher.cc +++ b/src/librbd/ImageWatcher.cc @@ -17,6 +17,8 @@ #include "common/errno.h" #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::ImageWatcher: " diff --git a/src/librbd/ObjectMap.cc b/src/librbd/ObjectMap.cc index 160bb4dcf9e..aab6e7956ea 100644 --- a/src/librbd/ObjectMap.cc +++ b/src/librbd/ObjectMap.cc @@ -23,6 +23,9 @@ #include "cls/rbd/cls_rbd_types.h" #include "include/stringify.h" #include "osdc/Striper.h" + +#include +#include // for std::shared_lock #include #define dout_subsys ceph_subsys_rbd diff --git a/src/librbd/ObjectMap.h b/src/librbd/ObjectMap.h index 5e7fcbbe9dd..6c01e5103af 100644 --- a/src/librbd/ObjectMap.h +++ b/src/librbd/ObjectMap.h @@ -14,6 +14,8 @@ #include "librbd/Utils.h" #include +#include // for std::shared_lock + class Context; namespace ZTracer { struct Trace; } diff --git a/src/librbd/Operations.cc b/src/librbd/Operations.cc index e3cf3df3d95..a904fc6eedc 100644 --- a/src/librbd/Operations.cc +++ b/src/librbd/Operations.cc @@ -39,6 +39,7 @@ #include "librbd/operation/SnapshotLimitRequest.h" #include "librbd/operation/SparsifyRequest.h" #include +#include // for std::shared_lock #include #include diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc index 413983f3e63..19e286ce0f8 100644 --- a/src/librbd/WatchNotifyTypes.cc +++ b/src/librbd/WatchNotifyTypes.cc @@ -7,6 +7,8 @@ #include "include/stringify.h" #include "librbd/WatchNotifyTypes.h" +#include + namespace librbd { namespace watch_notify { diff --git a/src/librbd/Watcher.cc b/src/librbd/Watcher.cc index c215d6df74a..7b1d24b6122 100644 --- a/src/librbd/Watcher.cc +++ b/src/librbd/Watcher.cc @@ -13,6 +13,8 @@ // re-include our assert to clobber the system one; fix dout: #include "include/ceph_assert.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd namespace librbd { diff --git a/src/librbd/Watcher.h b/src/librbd/Watcher.h index e029430c5b7..c43c2884f17 100644 --- a/src/librbd/Watcher.h +++ b/src/librbd/Watcher.h @@ -11,6 +11,7 @@ #include "librbd/watcher/Notifier.h" #include "librbd/watcher/Types.h" #include +#include // for std::shared_lock #include namespace librbd { diff --git a/src/librbd/api/DiffIterate.cc b/src/librbd/api/DiffIterate.cc index f7dd57504db..aa5ad53a0ee 100644 --- a/src/librbd/api/DiffIterate.cc +++ b/src/librbd/api/DiffIterate.cc @@ -21,6 +21,7 @@ #include #include #include +#include // for std::shared_lock #include #define dout_subsys ceph_subsys_rbd diff --git a/src/librbd/api/Group.cc b/src/librbd/api/Group.cc index c2140e818b6..94d5cdfa847 100644 --- a/src/librbd/api/Group.cc +++ b/src/librbd/api/Group.cc @@ -15,6 +15,8 @@ #include "librbd/internal.h" #include "librbd/io/AioCompletion.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::api::Group: " << __func__ << ": " diff --git a/src/librbd/api/Image.cc b/src/librbd/api/Image.cc index d813242f5f4..1d49c1ce128 100644 --- a/src/librbd/api/Image.cc +++ b/src/librbd/api/Image.cc @@ -30,6 +30,8 @@ #include "librbd/io/ImageDispatchSpec.h" #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::api::Image: " << __func__ << ": " diff --git a/src/librbd/api/Migration.cc b/src/librbd/api/Migration.cc index dea3f8384c6..a166a4c5752 100644 --- a/src/librbd/api/Migration.cc +++ b/src/librbd/api/Migration.cc @@ -42,6 +42,8 @@ #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::Migration: " << __func__ << ": " diff --git a/src/librbd/api/Mirror.cc b/src/librbd/api/Mirror.cc index d370d91d858..fa22084eb2b 100644 --- a/src/librbd/api/Mirror.cc +++ b/src/librbd/api/Mirror.cc @@ -36,6 +36,7 @@ #include "json_spirit/json_spirit.h" #include +#include // for std::shared_lock #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/api/Snapshot.cc b/src/librbd/api/Snapshot.cc index e32c79b97a3..044237484a9 100644 --- a/src/librbd/api/Snapshot.cc +++ b/src/librbd/api/Snapshot.cc @@ -15,6 +15,8 @@ #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::api::Snapshot: " << __func__ << ": " diff --git a/src/librbd/cache/ObjectCacherWriteback.cc b/src/librbd/cache/ObjectCacherWriteback.cc index 9f2c26b2a10..97eb7ec83d4 100644 --- a/src/librbd/cache/ObjectCacherWriteback.cc +++ b/src/librbd/cache/ObjectCacherWriteback.cc @@ -28,6 +28,8 @@ #include "include/ceph_assert.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::cache::ObjectCacherWriteback: " diff --git a/src/librbd/cache/ObjectCacherWriteback.h b/src/librbd/cache/ObjectCacherWriteback.h index d8c2ebbd991..169204c1385 100644 --- a/src/librbd/cache/ObjectCacherWriteback.h +++ b/src/librbd/cache/ObjectCacherWriteback.h @@ -5,6 +5,7 @@ #define CEPH_LIBRBD_CACHE_OBJECT_CACHER_WRITEBACK_H #include "common/snap_types.h" +#include "include/unordered_map.h" #include "osd/osd_types.h" #include "osdc/WritebackHandler.h" #include diff --git a/src/librbd/cache/pwl/AbstractWriteLog.cc b/src/librbd/cache/pwl/AbstractWriteLog.cc index 41e10d05f59..65aa76e1a43 100644 --- a/src/librbd/cache/pwl/AbstractWriteLog.cc +++ b/src/librbd/cache/pwl/AbstractWriteLog.cc @@ -5,20 +5,24 @@ #include "include/buffer.h" #include "include/Context.h" #include "include/ceph_assert.h" +#include "common/Clock.h" // for ceph_clock_now() +#include "common/debug.h" #include "common/deleter.h" -#include "common/dout.h" #include "common/environment.h" #include "common/errno.h" #include "common/hostname.h" #include "common/WorkQueue.h" #include "common/Timer.h" #include "common/perf_counters.h" +#include "common/perf_counters_collection.h" #include "librbd/ImageCtx.h" #include "librbd/asio/ContextWQ.h" #include "librbd/cache/pwl/ImageCacheState.h" #include "librbd/cache/pwl/LogEntry.h" #include "librbd/plugin/Api.h" + #include +#include // for std::shared_lock #include #undef dout_subsys diff --git a/src/librbd/cache/pwl/ImageCacheState.cc b/src/librbd/cache/pwl/ImageCacheState.cc index ab941df0f65..992786d521f 100644 --- a/src/librbd/cache/pwl/ImageCacheState.cc +++ b/src/librbd/cache/pwl/ImageCacheState.cc @@ -6,11 +6,15 @@ #include "librbd/cache/pwl/ImageCacheState.h" #include "librbd/ImageCtx.h" #include "librbd/Operations.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/config_proxy.h" +#include "common/debug.h" #include "common/environment.h" #include "common/hostname.h" #include "librbd/plugin/Api.h" +#include // for std::shared_lock + #undef dout_subsys #define dout_subsys ceph_subsys_rbd_pwl #undef dout_prefix diff --git a/src/librbd/cache/pwl/LogOperation.cc b/src/librbd/cache/pwl/LogOperation.cc index e779802f0cf..c051f561b65 100644 --- a/src/librbd/cache/pwl/LogOperation.cc +++ b/src/librbd/cache/pwl/LogOperation.cc @@ -4,6 +4,8 @@ #include #include "LogOperation.h" #include "librbd/cache/pwl/Types.h" +#include "common/debug.h" +#include "common/perf_counters.h" #define dout_subsys ceph_subsys_rbd_pwl #undef dout_prefix diff --git a/src/librbd/cache/pwl/Request.cc b/src/librbd/cache/pwl/Request.cc index 96333192527..79f9922f49f 100644 --- a/src/librbd/cache/pwl/Request.cc +++ b/src/librbd/cache/pwl/Request.cc @@ -5,6 +5,8 @@ #include "librbd/BlockGuard.h" #include "librbd/cache/pwl/LogEntry.h" #include "librbd/cache/pwl/AbstractWriteLog.h" +#include "common/Clock.h" // for ceph_clock_now() +#include "common/debug.h" #define dout_subsys ceph_subsys_rbd_pwl #undef dout_prefix diff --git a/src/librbd/cache/pwl/Request.h b/src/librbd/cache/pwl/Request.h index 4840b049e58..a7f94f7bf31 100644 --- a/src/librbd/cache/pwl/Request.h +++ b/src/librbd/cache/pwl/Request.h @@ -4,6 +4,7 @@ #ifndef CEPH_LIBRBD_CACHE_PWL_REQUEST_H #define CEPH_LIBRBD_CACHE_PWL_REQUEST_H +#include "common/perf_counters.h" #include "include/Context.h" #include "librbd/cache/pwl/Types.h" #include "librbd/cache/pwl/LogOperation.h" diff --git a/src/librbd/cache/pwl/ShutdownRequest.cc b/src/librbd/cache/pwl/ShutdownRequest.cc index e022328ba70..c6827f784e3 100644 --- a/src/librbd/cache/pwl/ShutdownRequest.cc +++ b/src/librbd/cache/pwl/ShutdownRequest.cc @@ -13,6 +13,8 @@ #include "librbd/cache/pwl/AbstractWriteLog.h" #include "librbd/plugin/Api.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd_pwl #undef dout_prefix #define dout_prefix *_dout << "librbd::cache::pwl:ShutdownRequest: " \ diff --git a/src/librbd/cache/pwl/Types.cc b/src/librbd/cache/pwl/Types.cc index c29305eecaf..a44056397b9 100644 --- a/src/librbd/cache/pwl/Types.cc +++ b/src/librbd/cache/pwl/Types.cc @@ -4,6 +4,7 @@ #include #include "Types.h" #include "common/ceph_context.h" +#include "common/Formatter.h" #include "include/Context.h" #include "include/stringify.h" diff --git a/src/librbd/cache/pwl/Types.h b/src/librbd/cache/pwl/Types.h index 0d8c93a24c3..e8fbd03563d 100644 --- a/src/librbd/cache/pwl/Types.h +++ b/src/librbd/cache/pwl/Types.h @@ -13,6 +13,7 @@ #include #include "librbd/BlockGuard.h" #include "librbd/io/Types.h" +#include "include/utime.h" namespace ceph { class Formatter; diff --git a/src/librbd/cache/pwl/rwl/LogOperation.cc b/src/librbd/cache/pwl/rwl/LogOperation.cc index 53fb917b257..a900a0649a6 100644 --- a/src/librbd/cache/pwl/rwl/LogOperation.cc +++ b/src/librbd/cache/pwl/rwl/LogOperation.cc @@ -2,6 +2,8 @@ // vim: ts=8 sw=2 smarttab #include "LogOperation.h" +#include "common/debug.h" +#include "common/perf_counters.h" #define dout_subsys ceph_subsys_rbd_pwl #undef dout_prefix diff --git a/src/librbd/cache/pwl/rwl/ReadRequest.cc b/src/librbd/cache/pwl/rwl/ReadRequest.cc index f91f8e5a7c2..454e77b794e 100644 --- a/src/librbd/cache/pwl/rwl/ReadRequest.cc +++ b/src/librbd/cache/pwl/rwl/ReadRequest.cc @@ -2,6 +2,9 @@ // vim: ts=8 sw=2 smarttab #include "ReadRequest.h" +#include "common/Clock.h" // for ceph_clock_now() +#include "common/debug.h" +#include "common/perf_counters.h" #define dout_subsys ceph_subsys_rbd_pwl #undef dout_prefix diff --git a/src/librbd/cache/pwl/rwl/WriteLog.cc b/src/librbd/cache/pwl/rwl/WriteLog.cc index e922ba543aa..85a05ac9817 100644 --- a/src/librbd/cache/pwl/rwl/WriteLog.cc +++ b/src/librbd/cache/pwl/rwl/WriteLog.cc @@ -5,6 +5,7 @@ #include "include/buffer.h" #include "include/Context.h" #include "include/ceph_assert.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/deleter.h" #include "common/dout.h" #include "common/environment.h" diff --git a/src/librbd/cache/pwl/ssd/ReadRequest.cc b/src/librbd/cache/pwl/ssd/ReadRequest.cc index 1a80a8d8ca7..e9d0c6bb7ca 100644 --- a/src/librbd/cache/pwl/ssd/ReadRequest.cc +++ b/src/librbd/cache/pwl/ssd/ReadRequest.cc @@ -2,6 +2,9 @@ // vim: ts=8 sw=2 smarttab #include "ReadRequest.h" +#include "common/Clock.h" // for ceph_clock_now() +#include "common/debug.h" +#include "common/perf_counters.h" #define dout_subsys ceph_subsys_rbd_pwl #undef dout_prefix diff --git a/src/librbd/cache/pwl/ssd/WriteLog.cc b/src/librbd/cache/pwl/ssd/WriteLog.cc index 753b15b69f7..3dca29aa6a7 100644 --- a/src/librbd/cache/pwl/ssd/WriteLog.cc +++ b/src/librbd/cache/pwl/ssd/WriteLog.cc @@ -5,6 +5,7 @@ #include "include/buffer.h" #include "include/Context.h" #include "include/ceph_assert.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/deleter.h" #include "common/dout.h" #include "common/environment.h" diff --git a/src/librbd/deep_copy/ImageCopyRequest.cc b/src/librbd/deep_copy/ImageCopyRequest.cc index 7f684c5b0a5..618bb65866d 100644 --- a/src/librbd/deep_copy/ImageCopyRequest.cc +++ b/src/librbd/deep_copy/ImageCopyRequest.cc @@ -11,6 +11,8 @@ #include "librbd/object_map/DiffRequest.h" #include "osdc/Striper.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::deep_copy::ImageCopyRequest: " \ diff --git a/src/librbd/deep_copy/ObjectCopyRequest.cc b/src/librbd/deep_copy/ObjectCopyRequest.cc index 0bf9855cbc1..036ac8e8005 100644 --- a/src/librbd/deep_copy/ObjectCopyRequest.cc +++ b/src/librbd/deep_copy/ObjectCopyRequest.cc @@ -18,6 +18,8 @@ #include "librbd/io/Utils.h" #include "osdc/Striper.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::deep_copy::ObjectCopyRequest: " \ diff --git a/src/librbd/deep_copy/SetHeadRequest.cc b/src/librbd/deep_copy/SetHeadRequest.cc index a82b93592de..08fe6fa985a 100644 --- a/src/librbd/deep_copy/SetHeadRequest.cc +++ b/src/librbd/deep_copy/SetHeadRequest.cc @@ -10,6 +10,8 @@ #include "librbd/image/AttachParentRequest.h" #include "librbd/image/DetachParentRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::deep_copy::SetHeadRequest: " \ diff --git a/src/librbd/deep_copy/SnapshotCopyRequest.cc b/src/librbd/deep_copy/SnapshotCopyRequest.cc index 5b7f3b7a83e..1de77a3bfb1 100644 --- a/src/librbd/deep_copy/SnapshotCopyRequest.cc +++ b/src/librbd/deep_copy/SnapshotCopyRequest.cc @@ -12,6 +12,8 @@ #include "librbd/asio/ContextWQ.h" #include "osdc/Striper.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::deep_copy::SnapshotCopyRequest: " \ diff --git a/src/librbd/deep_copy/SnapshotCreateRequest.cc b/src/librbd/deep_copy/SnapshotCreateRequest.cc index 394aee28725..61a364a1341 100644 --- a/src/librbd/deep_copy/SnapshotCreateRequest.cc +++ b/src/librbd/deep_copy/SnapshotCreateRequest.cc @@ -12,6 +12,8 @@ #include "librbd/Utils.h" #include "osdc/Striper.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::deep_copy::SnapshotCreateRequest: " \ diff --git a/src/librbd/exclusive_lock/ImageDispatch.cc b/src/librbd/exclusive_lock/ImageDispatch.cc index 4ec513161f8..72af2c3f3c2 100644 --- a/src/librbd/exclusive_lock/ImageDispatch.cc +++ b/src/librbd/exclusive_lock/ImageDispatch.cc @@ -14,6 +14,8 @@ #include "librbd/io/ImageDispatchSpec.h" #include "librbd/io/ImageDispatcherInterface.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::exclusive_lock::ImageDispatch: " \ diff --git a/src/librbd/exclusive_lock/PostAcquireRequest.cc b/src/librbd/exclusive_lock/PostAcquireRequest.cc index 4553b21583f..8caacad666f 100644 --- a/src/librbd/exclusive_lock/PostAcquireRequest.cc +++ b/src/librbd/exclusive_lock/PostAcquireRequest.cc @@ -18,6 +18,8 @@ #include "librbd/journal/Policy.h" #include "librbd/PluginRegistry.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::exclusive_lock::PostAcquireRequest: " \ diff --git a/src/librbd/exclusive_lock/PreReleaseRequest.cc b/src/librbd/exclusive_lock/PreReleaseRequest.cc index a9cd1248a7c..255901e3d4e 100644 --- a/src/librbd/exclusive_lock/PreReleaseRequest.cc +++ b/src/librbd/exclusive_lock/PreReleaseRequest.cc @@ -19,6 +19,8 @@ #include "librbd/io/Types.h" #include "librbd/PluginRegistry.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::exclusive_lock::PreReleaseRequest: " \ diff --git a/src/librbd/image/AttachChildRequest.cc b/src/librbd/image/AttachChildRequest.cc index 2f74191ed32..a70432a2a06 100644 --- a/src/librbd/image/AttachChildRequest.cc +++ b/src/librbd/image/AttachChildRequest.cc @@ -9,6 +9,8 @@ #include "librbd/Utils.h" #include "librbd/image/RefreshRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::image::AttachChildRequest: " << this \ diff --git a/src/librbd/image/CloseRequest.cc b/src/librbd/image/CloseRequest.cc index eac755e4579..82c64990052 100644 --- a/src/librbd/image/CloseRequest.cc +++ b/src/librbd/image/CloseRequest.cc @@ -17,6 +17,8 @@ #include "librbd/io/ImageDispatchSpec.h" #include "librbd/io/ObjectDispatcherInterface.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::image::CloseRequest: " diff --git a/src/librbd/image/DetachChildRequest.cc b/src/librbd/image/DetachChildRequest.cc index ab39dbcd72d..1774fc86fef 100644 --- a/src/librbd/image/DetachChildRequest.cc +++ b/src/librbd/image/DetachChildRequest.cc @@ -3,6 +3,7 @@ #include "librbd/image/DetachChildRequest.h" #include "common/dout.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/errno.h" #include "cls/rbd/cls_rbd_client.h" #include "librbd/ExclusiveLock.h" @@ -13,6 +14,8 @@ #include "librbd/asio/ContextWQ.h" #include "librbd/journal/DisabledPolicy.h" #include "librbd/trash/RemoveRequest.h" + +#include // for std::shared_lock #include #define dout_subsys ceph_subsys_rbd diff --git a/src/librbd/image/ListWatchersRequest.cc b/src/librbd/image/ListWatchersRequest.cc index 7ccbd136f62..b0f3655dfe3 100644 --- a/src/librbd/image/ListWatchersRequest.cc +++ b/src/librbd/image/ListWatchersRequest.cc @@ -11,6 +11,7 @@ #include "librbd/Utils.h" #include +#include // for std::shared_lock #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/image/OpenRequest.cc b/src/librbd/image/OpenRequest.cc index 70008d712ca..23f358ff1f2 100644 --- a/src/librbd/image/OpenRequest.cc +++ b/src/librbd/image/OpenRequest.cc @@ -18,6 +18,8 @@ #include #include "include/ceph_assert.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::image::OpenRequest: " diff --git a/src/librbd/image/PreRemoveRequest.cc b/src/librbd/image/PreRemoveRequest.cc index fa4141834b1..69dac0d44f3 100644 --- a/src/librbd/image/PreRemoveRequest.cc +++ b/src/librbd/image/PreRemoveRequest.cc @@ -12,6 +12,8 @@ #include "librbd/journal/DisabledPolicy.h" #include "librbd/operation/SnapshotRemoveRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::image::PreRemoveRequest: " << this \ diff --git a/src/librbd/image/RefreshRequest.cc b/src/librbd/image/RefreshRequest.cc index 24159c55bf2..e8ad7b8c7ca 100644 --- a/src/librbd/image/RefreshRequest.cc +++ b/src/librbd/image/RefreshRequest.cc @@ -22,6 +22,8 @@ #include "librbd/io/ImageDispatcherInterface.h" #include "librbd/journal/Policy.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::image::RefreshRequest: " diff --git a/src/librbd/image/RemoveRequest.cc b/src/librbd/image/RemoveRequest.cc index 42af593b1b5..d8d5f4e7a68 100644 --- a/src/librbd/image/RemoveRequest.cc +++ b/src/librbd/image/RemoveRequest.cc @@ -15,6 +15,8 @@ #include "librbd/mirror/DisableRequest.h" #include "librbd/operation/TrimRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::image::RemoveRequest: " << this << " " \ diff --git a/src/librbd/image/SetSnapRequest.cc b/src/librbd/image/SetSnapRequest.cc index fbc234aef9b..e09d22f7fb6 100644 --- a/src/librbd/image/SetSnapRequest.cc +++ b/src/librbd/image/SetSnapRequest.cc @@ -11,6 +11,8 @@ #include "librbd/image/RefreshParentRequest.h" #include "librbd/io/ImageDispatcherInterface.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::image::SetSnapRequest: " diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index c5500536669..f7adce4cd34 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -62,6 +62,8 @@ #include #include "include/ceph_assert.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd: " diff --git a/src/librbd/io/AsyncOperation.cc b/src/librbd/io/AsyncOperation.cc index 18db2410e4a..42bc0f2d7cc 100644 --- a/src/librbd/io/AsyncOperation.cc +++ b/src/librbd/io/AsyncOperation.cc @@ -7,6 +7,8 @@ #include "librbd/AsioEngine.h" #include "librbd/ImageCtx.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::io::AsyncOperation: " diff --git a/src/librbd/io/CopyupRequest.cc b/src/librbd/io/CopyupRequest.cc index 855e60523c0..34a4b876d47 100644 --- a/src/librbd/io/CopyupRequest.cc +++ b/src/librbd/io/CopyupRequest.cc @@ -26,6 +26,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::io::CopyupRequest: " << this \ diff --git a/src/librbd/io/ImageDispatch.cc b/src/librbd/io/ImageDispatch.cc index 12c55cb0c66..57067434811 100644 --- a/src/librbd/io/ImageDispatch.cc +++ b/src/librbd/io/ImageDispatch.cc @@ -8,6 +8,8 @@ #include "librbd/io/ImageRequest.h" #include "librbd/io/ObjectDispatcherInterface.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::io::ImageDispatch: " << this << " " \ diff --git a/src/librbd/io/ImageDispatcher.cc b/src/librbd/io/ImageDispatcher.cc index 577c1d990d8..e6b3878c101 100644 --- a/src/librbd/io/ImageDispatcher.cc +++ b/src/librbd/io/ImageDispatcher.cc @@ -16,6 +16,8 @@ #include "librbd/io/WriteBlockImageDispatch.h" #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::io::ImageDispatcher: " << this \ diff --git a/src/librbd/io/ImageRequest.cc b/src/librbd/io/ImageRequest.cc index fb9f8944ed8..5c10fe4048a 100644 --- a/src/librbd/io/ImageRequest.cc +++ b/src/librbd/io/ImageRequest.cc @@ -22,6 +22,7 @@ #include #include #include +#include // for std::shared_lock #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/io/ObjectDispatcher.cc b/src/librbd/io/ObjectDispatcher.cc index b66c6bb18c8..5852fd92592 100644 --- a/src/librbd/io/ObjectDispatcher.cc +++ b/src/librbd/io/ObjectDispatcher.cc @@ -12,6 +12,8 @@ #include "librbd/io/ObjectDispatchSpec.h" #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::io::ObjectDispatcher: " << this \ diff --git a/src/librbd/io/ObjectRequest.cc b/src/librbd/io/ObjectRequest.cc index a7748623037..249ae94d477 100644 --- a/src/librbd/io/ObjectRequest.cc +++ b/src/librbd/io/ObjectRequest.cc @@ -24,6 +24,8 @@ #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::io::ObjectRequest: " << this \ diff --git a/src/librbd/io/SimpleSchedulerObjectDispatch.cc b/src/librbd/io/SimpleSchedulerObjectDispatch.cc index cd2ffb1975d..eec2686e73a 100644 --- a/src/librbd/io/SimpleSchedulerObjectDispatch.cc +++ b/src/librbd/io/SimpleSchedulerObjectDispatch.cc @@ -4,6 +4,7 @@ #include "librbd/io/SimpleSchedulerObjectDispatch.h" #include "include/neorados/RADOS.hpp" #include "common/ceph_time.h" +#include "common/Clock.h" // for ceph_clock_now() #include "common/Timer.h" #include "common/errno.h" #include "librbd/AsioEngine.h" diff --git a/src/librbd/io/Utils.cc b/src/librbd/io/Utils.cc index 00a7ef6d995..26aaedef598 100644 --- a/src/librbd/io/Utils.cc +++ b/src/librbd/io/Utils.cc @@ -15,6 +15,8 @@ #include "osd/osd_types.h" #include "osdc/Striper.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::io::util: " << __func__ << ": " diff --git a/src/librbd/io/WriteBlockImageDispatch.h b/src/librbd/io/WriteBlockImageDispatch.h index b1d0ddb0ed0..2957c6490e8 100644 --- a/src/librbd/io/WriteBlockImageDispatch.h +++ b/src/librbd/io/WriteBlockImageDispatch.h @@ -12,7 +12,9 @@ #include "common/Throttle.h" #include "librbd/io/ReadResult.h" #include "librbd/io/Types.h" + #include +#include // for std::shared_lock struct Context; diff --git a/src/librbd/journal/Replay.cc b/src/librbd/journal/Replay.cc index 42acf5eb241..e8c6cfbbbc8 100644 --- a/src/librbd/journal/Replay.cc +++ b/src/librbd/journal/Replay.cc @@ -14,6 +14,8 @@ #include "librbd/io/AioCompletion.h" #include "librbd/io/ImageRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::journal::Replay: " << this << " " diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc index 01bbb6e34b1..690ed6eb860 100644 --- a/src/librbd/librbd.cc +++ b/src/librbd/librbd.cc @@ -50,6 +50,7 @@ #include "librbd/io/AioCompletion.h" #include "librbd/io/ReadResult.h" #include +#include // for std::shared_lock #include #include #include diff --git a/src/librbd/mirror/DemoteRequest.cc b/src/librbd/mirror/DemoteRequest.cc index 350a76d8342..fd24bb69896 100644 --- a/src/librbd/mirror/DemoteRequest.cc +++ b/src/librbd/mirror/DemoteRequest.cc @@ -13,6 +13,8 @@ #include "librbd/mirror/GetInfoRequest.h" #include "librbd/mirror/snapshot/DemoteRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::mirror::DemoteRequest: " << this \ diff --git a/src/librbd/mirror/DisableRequest.cc b/src/librbd/mirror/DisableRequest.cc index 09378ce58b8..3953de265d5 100644 --- a/src/librbd/mirror/DisableRequest.cc +++ b/src/librbd/mirror/DisableRequest.cc @@ -18,6 +18,8 @@ #include "librbd/mirror/ImageStateUpdateRequest.h" #include "librbd/mirror/snapshot/PromoteRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::mirror::DisableRequest: " \ diff --git a/src/librbd/mirror/GetInfoRequest.cc b/src/librbd/mirror/GetInfoRequest.cc index 2db8aaa84c5..e904a21bba1 100644 --- a/src/librbd/mirror/GetInfoRequest.cc +++ b/src/librbd/mirror/GetInfoRequest.cc @@ -10,6 +10,8 @@ #include "librbd/Journal.h" #include "librbd/Utils.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::mirror::GetInfoRequest: " << this \ diff --git a/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc b/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc index eed0aa506a3..f7dbe405d50 100644 --- a/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc +++ b/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc @@ -12,6 +12,8 @@ #include "librbd/mirror/snapshot/Utils.h" #include "librbd/mirror/snapshot/WriteImageStateRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc b/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc index c8e3a4fe7a6..1e4391d2a25 100644 --- a/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc +++ b/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc @@ -12,6 +12,8 @@ #include "librbd/mirror/snapshot/UnlinkPeerRequest.h" #include "librbd/mirror/snapshot/Utils.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/mirror/snapshot/PromoteRequest.cc b/src/librbd/mirror/snapshot/PromoteRequest.cc index 9718c299e03..1a6b1c81bc4 100644 --- a/src/librbd/mirror/snapshot/PromoteRequest.cc +++ b/src/librbd/mirror/snapshot/PromoteRequest.cc @@ -17,6 +17,8 @@ #include "librbd/mirror/snapshot/CreatePrimaryRequest.h" #include "librbd/mirror/snapshot/Utils.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::mirror::snapshot::PromoteRequest: " \ diff --git a/src/librbd/mirror/snapshot/SetImageStateRequest.cc b/src/librbd/mirror/snapshot/SetImageStateRequest.cc index 9fcee032291..fee05ef0146 100644 --- a/src/librbd/mirror/snapshot/SetImageStateRequest.cc +++ b/src/librbd/mirror/snapshot/SetImageStateRequest.cc @@ -12,6 +12,8 @@ #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/mirror/snapshot/Utils.cc b/src/librbd/mirror/snapshot/Utils.cc index 36d1558be43..9b8afbd59fa 100644 --- a/src/librbd/mirror/snapshot/Utils.cc +++ b/src/librbd/mirror/snapshot/Utils.cc @@ -7,6 +7,8 @@ #include "librbd/ImageCtx.h" #include "librbd/mirror/snapshot/Utils.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/object_map/DiffRequest.cc b/src/librbd/object_map/DiffRequest.cc index acaf31a39bf..505bd67f13f 100644 --- a/src/librbd/object_map/DiffRequest.cc +++ b/src/librbd/object_map/DiffRequest.cc @@ -8,6 +8,8 @@ #include "librbd/ObjectMap.h" #include "librbd/Utils.h" #include "osdc/Striper.h" + +#include // for std::shared_lock #include #define dout_subsys ceph_subsys_rbd diff --git a/src/librbd/object_map/DiffRequest.h b/src/librbd/object_map/DiffRequest.h index 740f4e02a11..7739beb3bc8 100644 --- a/src/librbd/object_map/DiffRequest.h +++ b/src/librbd/object_map/DiffRequest.h @@ -9,6 +9,7 @@ #include "common/ceph_mutex.h" #include "librbd/object_map/Types.h" #include +#include // for std::shared_lock struct Context; diff --git a/src/librbd/object_map/RefreshRequest.cc b/src/librbd/object_map/RefreshRequest.cc index 1527f07c7d7..3d84be2d622 100644 --- a/src/librbd/object_map/RefreshRequest.cc +++ b/src/librbd/object_map/RefreshRequest.cc @@ -13,6 +13,8 @@ #include "librbd/Utils.h" #include "osdc/Striper.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::object_map::RefreshRequest: " diff --git a/src/librbd/object_map/Request.cc b/src/librbd/object_map/Request.cc index 1e1aab2ae5c..c4f36733b2b 100644 --- a/src/librbd/object_map/Request.cc +++ b/src/librbd/object_map/Request.cc @@ -8,6 +8,8 @@ #include "librbd/ImageCtx.h" #include "librbd/object_map/InvalidateRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::object_map::Request: " diff --git a/src/librbd/object_map/SnapshotCreateRequest.cc b/src/librbd/object_map/SnapshotCreateRequest.cc index 3b2e7ee8296..cccbeb60f62 100644 --- a/src/librbd/object_map/SnapshotCreateRequest.cc +++ b/src/librbd/object_map/SnapshotCreateRequest.cc @@ -6,7 +6,9 @@ #include "librbd/ImageCtx.h" #include "librbd/ObjectMap.h" #include "cls/lock/cls_lock_client.h" + #include +#include // for std::shared_lock #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/object_map/SnapshotRemoveRequest.cc b/src/librbd/object_map/SnapshotRemoveRequest.cc index 1c2ffc753f2..60b903719ef 100644 --- a/src/librbd/object_map/SnapshotRemoveRequest.cc +++ b/src/librbd/object_map/SnapshotRemoveRequest.cc @@ -9,6 +9,8 @@ #include "librbd/object_map/InvalidateRequest.h" #include "cls/lock/cls_lock_client.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::object_map::SnapshotRemoveRequest: " \ diff --git a/src/librbd/object_map/SnapshotRollbackRequest.cc b/src/librbd/object_map/SnapshotRollbackRequest.cc index 7c2f441cc3a..0bd2b1727d0 100644 --- a/src/librbd/object_map/SnapshotRollbackRequest.cc +++ b/src/librbd/object_map/SnapshotRollbackRequest.cc @@ -7,7 +7,9 @@ #include "librbd/ObjectMap.h" #include "librbd/object_map/InvalidateRequest.h" #include "cls/lock/cls_lock_client.h" + #include +#include // for std::shared_lock #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/object_map/UpdateRequest.cc b/src/librbd/object_map/UpdateRequest.cc index 30a1f2121bd..c0fa27a353a 100644 --- a/src/librbd/object_map/UpdateRequest.cc +++ b/src/librbd/object_map/UpdateRequest.cc @@ -9,6 +9,8 @@ #include "librbd/ObjectMap.h" #include "librbd/Utils.h" #include "cls/lock/cls_lock_client.h" + +#include // for std::shared_lock #include #define dout_subsys ceph_subsys_rbd diff --git a/src/librbd/operation/FlattenRequest.cc b/src/librbd/operation/FlattenRequest.cc index 8034637e8e6..14789e95515 100644 --- a/src/librbd/operation/FlattenRequest.cc +++ b/src/librbd/operation/FlattenRequest.cc @@ -18,6 +18,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::operation::FlattenRequest: " << this \ diff --git a/src/librbd/operation/MigrateRequest.cc b/src/librbd/operation/MigrateRequest.cc index 2b9adb77378..5642994ea93 100644 --- a/src/librbd/operation/MigrateRequest.cc +++ b/src/librbd/operation/MigrateRequest.cc @@ -16,6 +16,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::MigrateRequest: " << this << " " \ diff --git a/src/librbd/operation/ObjectMapIterate.cc b/src/librbd/operation/ObjectMapIterate.cc index 50db3df851f..2419233dca7 100644 --- a/src/librbd/operation/ObjectMapIterate.cc +++ b/src/librbd/operation/ObjectMapIterate.cc @@ -17,6 +17,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::ObjectMapIterateRequest: " diff --git a/src/librbd/operation/RebuildObjectMapRequest.cc b/src/librbd/operation/RebuildObjectMapRequest.cc index 5deb182e560..aa159a1d8e5 100644 --- a/src/librbd/operation/RebuildObjectMapRequest.cc +++ b/src/librbd/operation/RebuildObjectMapRequest.cc @@ -17,6 +17,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::RebuildObjectMapRequest: " diff --git a/src/librbd/operation/RenameRequest.cc b/src/librbd/operation/RenameRequest.cc index 15bcd819cf5..bcd6d1b0f6c 100644 --- a/src/librbd/operation/RenameRequest.cc +++ b/src/librbd/operation/RenameRequest.cc @@ -9,6 +9,8 @@ #include "librbd/internal.h" #include "librbd/Utils.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::operation::RenameRequest: " diff --git a/src/librbd/operation/Request.cc b/src/librbd/operation/Request.cc index 269c8a4f999..49f3e6bcca9 100644 --- a/src/librbd/operation/Request.cc +++ b/src/librbd/operation/Request.cc @@ -7,6 +7,8 @@ #include "librbd/ImageCtx.h" #include "librbd/asio/ContextWQ.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::Request: " diff --git a/src/librbd/operation/ResizeRequest.cc b/src/librbd/operation/ResizeRequest.cc index 1f09ea3082f..b69fe4f1943 100644 --- a/src/librbd/operation/ResizeRequest.cc +++ b/src/librbd/operation/ResizeRequest.cc @@ -15,6 +15,8 @@ #include "common/dout.h" #include "common/errno.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::operation::ResizeRequest: " << this \ diff --git a/src/librbd/operation/SnapshotCreateRequest.cc b/src/librbd/operation/SnapshotCreateRequest.cc index 8cea35d2f03..111b4c17ab8 100644 --- a/src/librbd/operation/SnapshotCreateRequest.cc +++ b/src/librbd/operation/SnapshotCreateRequest.cc @@ -13,6 +13,8 @@ #include "librbd/io/ImageDispatcherInterface.h" #include "librbd/mirror/snapshot/SetImageStateRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::SnapshotCreateRequest: " diff --git a/src/librbd/operation/SnapshotLimitRequest.cc b/src/librbd/operation/SnapshotLimitRequest.cc index 17aed5f6a50..2a887b420c1 100644 --- a/src/librbd/operation/SnapshotLimitRequest.cc +++ b/src/librbd/operation/SnapshotLimitRequest.cc @@ -6,6 +6,8 @@ #include "common/errno.h" #include "librbd/ImageCtx.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::SnapshotLimitRequest: " diff --git a/src/librbd/operation/SnapshotProtectRequest.cc b/src/librbd/operation/SnapshotProtectRequest.cc index f3b9e7e0b76..88f4bb15601 100644 --- a/src/librbd/operation/SnapshotProtectRequest.cc +++ b/src/librbd/operation/SnapshotProtectRequest.cc @@ -6,6 +6,8 @@ #include "common/errno.h" #include "librbd/ImageCtx.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::SnapshotProtectRequest: " diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc index f3b4dc62e04..c8f53d50f4c 100644 --- a/src/librbd/operation/SnapshotRemoveRequest.cc +++ b/src/librbd/operation/SnapshotRemoveRequest.cc @@ -12,6 +12,8 @@ #include "librbd/image/DetachChildRequest.h" #include "librbd/mirror/snapshot/RemoveImageStateRequest.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::SnapshotRemoveRequest: " << this << " " \ diff --git a/src/librbd/operation/SnapshotRenameRequest.cc b/src/librbd/operation/SnapshotRenameRequest.cc index e9257f18c02..8a79f26f151 100644 --- a/src/librbd/operation/SnapshotRenameRequest.cc +++ b/src/librbd/operation/SnapshotRenameRequest.cc @@ -6,6 +6,8 @@ #include "common/errno.h" #include "librbd/ImageCtx.h" +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::SnapshotRenameRequest: " diff --git a/src/librbd/operation/SnapshotRollbackRequest.cc b/src/librbd/operation/SnapshotRollbackRequest.cc index 87c5212deac..17501999c94 100644 --- a/src/librbd/operation/SnapshotRollbackRequest.cc +++ b/src/librbd/operation/SnapshotRollbackRequest.cc @@ -16,6 +16,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::SnapshotRollbackRequest: " diff --git a/src/librbd/operation/SnapshotUnprotectRequest.cc b/src/librbd/operation/SnapshotUnprotectRequest.cc index 76caf68f335..addd3c8e681 100644 --- a/src/librbd/operation/SnapshotUnprotectRequest.cc +++ b/src/librbd/operation/SnapshotUnprotectRequest.cc @@ -13,6 +13,7 @@ #include "librbd/Utils.h" #include #include +#include // for std::shared_lock #include #include #include diff --git a/src/librbd/operation/SparsifyRequest.cc b/src/librbd/operation/SparsifyRequest.cc index ef7fc78f502..c4f2e6f4441 100644 --- a/src/librbd/operation/SparsifyRequest.cc +++ b/src/librbd/operation/SparsifyRequest.cc @@ -16,6 +16,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd namespace librbd { diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc index 6c6685f2b75..adfe7967a36 100644 --- a/src/librbd/operation/TrimRequest.cc +++ b/src/librbd/operation/TrimRequest.cc @@ -19,6 +19,8 @@ #include #include +#include // for std::shared_lock + #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "librbd::TrimRequest: " diff --git a/src/librbd/watcher/Types.h b/src/librbd/watcher/Types.h index d1517fb0f5d..615872dc665 100644 --- a/src/librbd/watcher/Types.h +++ b/src/librbd/watcher/Types.h @@ -8,6 +8,10 @@ #include "include/buffer_fwd.h" #include "include/encoding.h" +#include +#include +#include + namespace ceph { class Formatter; } namespace librbd {