librbd: add missing includes

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/librbd/AsyncObjectThrottle.cc b/src/librbd/AsyncObjectThrottle.cc
index e0fcefff18a03f81be5000b421906bc130ac1838..655c36d28e706b827ce30bc77e4cbc3bb1f089f4 100644 (file)
--- a/src/librbd/AsyncObjectThrottle.cc
+++ b/src/librbd/AsyncObjectThrottle.cc
@@ -6,6 +6,8 @@
 #include "librbd/Utils.h"
 #include "librbd/asio/ContextWQ.h"
 
+#include <shared_mutex> // for std::shared_lock
+
 namespace librbd
 {
 

diff --git a/src/librbd/ConfigWatcher.cc b/src/librbd/ConfigWatcher.cc
index 0e412780438cfde6af815625f59cf05bb9a50972..6c13cbf4c75692996e1434244d68f7380ccc917f 100644 (file)
--- a/src/librbd/ConfigWatcher.cc
+++ b/src/librbd/ConfigWatcher.cc
@@ -13,6 +13,8 @@
 #include <vector>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <shared_mutex> // 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 af26ef0c9d78ee9d218d908159fd24977097b3c9..e6e3b3a4d38597266455fbf434adf97dadd98e53 100644 (file)
--- 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 <shared_mutex> // 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 bc148b1f5cd485a8e0aa93b5c1147986db90745f..b7fcf3fbc2ef4d038dab9f24067e285a850c6613 100644 (file)
--- 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 7d3016abef1b4e94c68f82e527f14fb5aa91d37b..0842ba3d56ac312e1e3244e705f02b94df4663fd 100644 (file)
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -44,6 +44,8 @@
 #include "osdc/Striper.h"
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <shared_mutex> // 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 7dd3d529831611ccf19b5966843e0b47cd7260b4..69e8403af83837a4e7de8fa7fa7355a1b68a4fc2 100644 (file)
--- a/src/librbd/ImageWatcher.cc
+++ b/src/librbd/ImageWatcher.cc
@@ -17,6 +17,8 @@
 #include "common/errno.h"
 #include <boost/bind/bind.hpp>
 
+#include <shared_mutex> // 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 160bb4dcf9e833e290036f109be7e11f9d4ed8ed..aab6e7956ea3ddb4a7e78b290f32f25c2b41caa0 100644 (file)
--- 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 <iomanip>
+#include <shared_mutex> // for std::shared_lock
 #include <sstream>
 
 #define dout_subsys ceph_subsys_rbd

diff --git a/src/librbd/ObjectMap.h b/src/librbd/ObjectMap.h
index 5e7fcbbe9dd721c7a8108b11fd077f19500e3948..6c01e5103af305d80780053d089fe8d847b19493 100644 (file)
--- a/src/librbd/ObjectMap.h
+++ b/src/librbd/ObjectMap.h
@@ -14,6 +14,8 @@
 #include "librbd/Utils.h"
 #include <boost/optional.hpp>
 
+#include <shared_mutex> // for std::shared_lock
+
 class Context;
 namespace ZTracer { struct Trace; }
 

diff --git a/src/librbd/Operations.cc b/src/librbd/Operations.cc
index e3cf3df3d95e10de3f41d321cd2245a06a37a1bf..a904fc6eedc5447437c46e1d074fa6dfa68fcd43 100644 (file)
--- 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 <set>
+#include <shared_mutex> // for std::shared_lock
 #include <boost/bind/bind.hpp>
 #include <boost/scope_exit.hpp>
 

diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc
index 413983f3e6377de1be9640ee977eb226018db1f6..19e286ce0f86ac34afcb1b294f775606ae82a1f2 100644 (file)
--- a/src/librbd/WatchNotifyTypes.cc
+++ b/src/librbd/WatchNotifyTypes.cc
@@ -7,6 +7,8 @@
 #include "include/stringify.h"
 #include "librbd/WatchNotifyTypes.h"
 
+#include <map>
+
 namespace librbd {
 namespace watch_notify {
 

diff --git a/src/librbd/Watcher.cc b/src/librbd/Watcher.cc
index c215d6df74a52db125803d4c00c91dab9ebcaa5b..7b1d24b6122ba2984ac18e73a149013652a67dfc 100644 (file)
--- 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 <shared_mutex> // 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 e029430c5b7d7a9939e92e2293de2f2816d36a16..c43c2884f17d7ef38cf89d8ed157349e9c2ef9c7 100644 (file)
--- 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 <string>
+#include <shared_mutex> // for std::shared_lock
 #include <utility>
 
 namespace librbd {

diff --git a/src/librbd/api/DiffIterate.cc b/src/librbd/api/DiffIterate.cc
index f7dd57504db42e43531d08df7f874fc3dc35183c..aa5ad53a0ee60694fca58d19ff4006d5d945bc16 100644 (file)
--- a/src/librbd/api/DiffIterate.cc
+++ b/src/librbd/api/DiffIterate.cc
@@ -21,6 +21,7 @@
 #include <boost/tuple/tuple.hpp>
 #include <list>
 #include <map>
+#include <shared_mutex> // for std::shared_lock
 #include <vector>
 
 #define dout_subsys ceph_subsys_rbd

diff --git a/src/librbd/api/Group.cc b/src/librbd/api/Group.cc
index c2140e818b6bee6e0ddcbcf132f9986a86e63ad6..94d5cdfa847574af4b6a66d8bd2efd96a32a8f6f 100644 (file)
--- 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 <shared_mutex> // 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 d813242f5f4704a0c507bddd587e5c0f1aa71dbe..1d49c1ce1286fdd933b5e3db6bb55e9100e61e7e 100644 (file)
--- a/src/librbd/api/Image.cc
+++ b/src/librbd/api/Image.cc
@@ -30,6 +30,8 @@
 #include "librbd/io/ImageDispatchSpec.h"
 #include <boost/scope_exit.hpp>
 
+#include <shared_mutex> // 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 dea3f8384c6b11fdc1af524ed260e384fea5f7ac..a166a4c5752ac074f97582ff9e1784d84849592d 100644 (file)
--- a/src/librbd/api/Migration.cc
+++ b/src/librbd/api/Migration.cc
@@ -42,6 +42,8 @@
 
 #include <boost/scope_exit.hpp>
 
+#include <shared_mutex> // 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 d370d91d858b37e3479923785727260a7bdddb77..fa22084eb2ba5be903d7b797e45ee531b482b0e7 100644 (file)
--- a/src/librbd/api/Mirror.cc
+++ b/src/librbd/api/Mirror.cc
@@ -36,6 +36,7 @@
 #include "json_spirit/json_spirit.h"
 
 #include <algorithm>
+#include <shared_mutex> // 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 e32c79b97a30fe9d053205cbf8997ce798003b84..044237484a926ede0f12d1bf4760867ad786158b 100644 (file)
--- a/src/librbd/api/Snapshot.cc
+++ b/src/librbd/api/Snapshot.cc
@@ -15,6 +15,8 @@
 
 #include <boost/variant.hpp>
 
+#include <shared_mutex> // 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 9f2c26b2a10672fe888be79ecf9a89efe792f6bb..97eb7ec83d4e3f3f3855c7eeae579f39743b8d0c 100644 (file)
--- a/src/librbd/cache/ObjectCacherWriteback.cc
+++ b/src/librbd/cache/ObjectCacherWriteback.cc
@@ -28,6 +28,8 @@
 
 #include "include/ceph_assert.h"
 
+#include <shared_mutex> // 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 d8c2ebbd991d007607fc7f88d471dc86e003a342..169204c1385bcfd312e7b5c16132c5634b92743b 100644 (file)
--- 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 <queue>

diff --git a/src/librbd/cache/pwl/AbstractWriteLog.cc b/src/librbd/cache/pwl/AbstractWriteLog.cc
index 41e10d05f59607fe97012dfd8b1fa84de61d05ff..65aa76e1a436c334f9d9eb8467792526b15586f4 100644 (file)
--- 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 <map>
+#include <shared_mutex> // for std::shared_lock
 #include <vector>
 
 #undef dout_subsys

diff --git a/src/librbd/cache/pwl/ImageCacheState.cc b/src/librbd/cache/pwl/ImageCacheState.cc
index ab941df0f65fc38fdee9fd68f9642637cee7b7a9..992786d521f235c98e24038f850096bc97ac25e0 100644 (file)
--- 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 <shared_mutex> // 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 e779802f0cf8be45d6d67eb777aca56940b4cb56..c051f561b65c95b0c370573f5f8f76b5601f5818 100644 (file)
--- a/src/librbd/cache/pwl/LogOperation.cc
+++ b/src/librbd/cache/pwl/LogOperation.cc
@@ -4,6 +4,8 @@
 #include <iostream>
 #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 96333192527ff01515250cfb3fdadb6b800ae246..79f9922f49fd37ec017122f617b8569ba165b2af 100644 (file)
--- 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 4840b049e58d0ce532f9f2f69e7c94992f08930d..a7f94f7bf3115a622ae61e933498e842596b13b2 100644 (file)
--- 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 e022328ba70e9bf1516088c94191bb8f2e4f68cb..c6827f784e3ca89c16e617fade8d2cd03a0c3f58 100644 (file)
--- 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 <shared_mutex> // 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 c29305eecaf0dd88c8a476bde3eca35984aed60c..a44056397b9c0ee66d62e68de4f4a12575f487ff 100644 (file)
--- a/src/librbd/cache/pwl/Types.cc
+++ b/src/librbd/cache/pwl/Types.cc
@@ -4,6 +4,7 @@
 #include <iostream>
 #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 0d8c93a24c3164ca2f6107c6de972d328d4f282b..e8fbd03563d13f3a31102a5fab1f7f10aa8ee8c6 100644 (file)
--- a/src/librbd/cache/pwl/Types.h
+++ b/src/librbd/cache/pwl/Types.h
@@ -13,6 +13,7 @@
 #include <vector>
 #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 53fb917b257f017b94ae792d3958e27846f2dcf4..a900a0649a6b5fc8d65ae6bb361ba8b08c0ddc83 100644 (file)
--- 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 f91f8e5a7c29a449a96ef72f865ab86605d1b703..454e77b794e634c5330b9fc6164a8c9a0233b5f0 100644 (file)
--- 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 e922ba543aa27852f0b9498a311ac76106a133c7..85a05ac98179cddd4a7ee04add1b679087548c55 100644 (file)
--- 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 1a80a8d8ca73c3ab565a202e1a9dbc8ca462cd36..e9d0c6bb7ca3fe4d2e4f7ba32368a38f959cd9f1 100644 (file)
--- 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 753b15b69f7f953e351f45bc5e0967966aa96a3c..3dca29aa6a78133b5cb838ccc8e39714dae0b13d 100644 (file)
--- 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 7f684c5b0a5378a9dc01c81adf61d370de08ace5..618bb65866d67d50fae855084bc683a35fa1680d 100644 (file)
--- 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 <shared_mutex> // 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 0bf9855cbc1e6dbc4c92d96a0571e74d0b1ecaa1..036ac8e80056803838869412ec85df257f088e94 100644 (file)
--- 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 <shared_mutex> // 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 a82b93592dea95a15cb70cbf24b7c1358202db11..08fe6fa985a392ddcfd1e2ca825417aeede078e3 100644 (file)
--- 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 <shared_mutex> // 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 5b7f3b7a83ef6850eb42cce1eedc6bbff8b125e7..1de77a3bfb10bea7251fb431384237a755e989b6 100644 (file)
--- 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 <shared_mutex> // 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 394aee287251e23a8e468efe7ddb7e25b622e0af..61a364a1341868d715434ed939888fd35c9bdc88 100644 (file)
--- 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 <shared_mutex> // 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 4ec513161f8086944740f170107028c48fcfcd7b..72af2c3f3c2344eb49e79e3d0802bbc158e8f6e0 100644 (file)
--- 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 <shared_mutex> // 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 4553b21583fa6883967705c45e7174f60f2c4a73..8caacad666fdb59f39a1e39db0c511210d328113 100644 (file)
--- 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 <shared_mutex> // 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 a9cd1248a7cbc31c0aab2de01403af19bd133cd3..255901e3d4e07006a7342bab317cd226e03cf73e 100644 (file)
--- 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 <shared_mutex> // 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 2f74191ed328ddf35157f94932105a48140cc8ef..a70432a2a06af547e0b7163863a7ca332a3803f6 100644 (file)
--- 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 <shared_mutex> // 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 eac755e45794942f35a708bd12b08aab115c963e..82c64990052f7d83dfca73db4a68752226dd18b9 100644 (file)
--- 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 <shared_mutex> // 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 ab39dbcd72ddcebf4709ae726fe11a928594f204..1774fc86fef409bb1ebc1f571e741b879d21763e 100644 (file)
--- 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 <shared_mutex> // for std::shared_lock
 #include <string>
 
 #define dout_subsys ceph_subsys_rbd

diff --git a/src/librbd/image/ListWatchersRequest.cc b/src/librbd/image/ListWatchersRequest.cc
index 7ccbd136f6267736e2e9b80d93dee3bf3b0d7c66..b0f3655dfe3cf0c6691b265efb5a48ee42ba1e14 100644 (file)
--- a/src/librbd/image/ListWatchersRequest.cc
+++ b/src/librbd/image/ListWatchersRequest.cc
@@ -11,6 +11,7 @@
 #include "librbd/Utils.h"
 
 #include <algorithm>
+#include <shared_mutex> // 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 70008d712ca69b5cf8edb892aa8dceebb2001e2e..23f358ff1f28634ac803a77e9724613e4fcc2fe2 100644 (file)
--- a/src/librbd/image/OpenRequest.cc
+++ b/src/librbd/image/OpenRequest.cc
@@ -18,6 +18,8 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include "include/ceph_assert.h"
 
+#include <shared_mutex> // 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 fa4141834b186c3b2a338363a638eef503abb3c7..69dac0d44f3fd276c4bc80f58c0fcdefc165eaa4 100644 (file)
--- 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 <shared_mutex> // 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 24159c55bf2825dfa24f555b1493937b28ff8999..e8ad7b8c7ca5bc0c2be600c9fc5ae1135494fc90 100644 (file)
--- 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 <shared_mutex> // 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 42af593b1b5e7403e0416d23b779c475909f3196..d8d5f4e7a680c5d53f9677fef499e6bfae2126ff 100644 (file)
--- 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 <shared_mutex> // 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 fbc234aef9b71067d6eb04cb16389f30cd421cb3..e09d22f7fb66ade9a27c9b65ea4c34d6ff912147 100644 (file)
--- 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 <shared_mutex> // 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 c550053666995397c6852c74b6d5143f4b1ed545..f7adce4cd343e9447ba3e0abbd79fdc4b13c9322 100644 (file)
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -62,6 +62,8 @@
 #include <boost/variant.hpp>
 #include "include/ceph_assert.h"
 
+#include <shared_mutex> // 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 18db2410e4a5a3a9dc96c06c18c5ab9120751c77..42bc0f2d7cc35ea04b35c5965e2c23472c6c8588 100644 (file)
--- 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 <shared_mutex> // 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 855e60523c03aae66240556c2d80c7ed879a28f8..34a4b876d475efd4555d6bd101121617fc6183df 100644 (file)
--- a/src/librbd/io/CopyupRequest.cc
+++ b/src/librbd/io/CopyupRequest.cc
@@ -26,6 +26,8 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
 
+#include <shared_mutex> // 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 12c55cb0c66595d7215994990845dd44539b891e..570674348119e2bf9a93ca30fe96632ffee13263 100644 (file)
--- 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 <shared_mutex> // 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 577c1d990d8729168d8d93d7fd05c12ad432a58b..e6b3878c101ce3a7d7fc31400355bccc2e2ac7ea 100644 (file)
--- a/src/librbd/io/ImageDispatcher.cc
+++ b/src/librbd/io/ImageDispatcher.cc
@@ -16,6 +16,8 @@
 #include "librbd/io/WriteBlockImageDispatch.h"
 #include <boost/variant.hpp>
 
+#include <shared_mutex> // 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 fb9f8944ed849bf837222b77ab34307b0537686d..5c10fe4048adfad26752e51cb5237ef105e2fff7 100644 (file)
--- a/src/librbd/io/ImageRequest.cc
+++ b/src/librbd/io/ImageRequest.cc
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <functional>
 #include <map>
+#include <shared_mutex> // 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 b66c6bb18c8e7ca5d01760f63f22dfa635ffe3bf..5852fd925926eeb7126e08b07dc4f85b554fe74d 100644 (file)
--- a/src/librbd/io/ObjectDispatcher.cc
+++ b/src/librbd/io/ObjectDispatcher.cc
@@ -12,6 +12,8 @@
 #include "librbd/io/ObjectDispatchSpec.h"
 #include <boost/variant.hpp>
 
+#include <shared_mutex> // 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 a7748623037e290f3df9c9fdd14451a0a0e41ad4..249ae94d477d0606d3e48122c9692b8bc2e46b31 100644 (file)
--- a/src/librbd/io/ObjectRequest.cc
+++ b/src/librbd/io/ObjectRequest.cc
@@ -24,6 +24,8 @@
 
 #include <boost/optional.hpp>
 
+#include <shared_mutex> // 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 cd2ffb1975d183ad2f60aeb586d7209058227c59..eec2686e73a1c13d30850bedfe13f2c701669524 100644 (file)
--- 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 00a7ef6d995592c580ec7e1e5641b0d576583018..26aaedef5987d12b1a312a7bb1cfc1255e6cff11 100644 (file)
--- 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 <shared_mutex> // 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 b1d0ddb0ed094c9ad2692c118233c95e64e7581e..2957c6490e8eb9a555722167c66359573cff030d 100644 (file)
--- 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 <list>
+#include <shared_mutex> // for std::shared_lock
 
 struct Context;
 

diff --git a/src/librbd/journal/Replay.cc b/src/librbd/journal/Replay.cc
index 42acf5eb24137ab1e810bdb256b2df10ad939c58..e8c6cfbbbc87a4bbbeb839e044d2c35f1be38803 100644 (file)
--- 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 <shared_mutex> // 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 01bbb6e34b1b9693b8f6eceac555ceda07a1861b..690ed6eb860f3caf1595c37ca0330f207b8153dc 100644 (file)
--- 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 <algorithm>
+#include <shared_mutex> // for std::shared_lock
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/src/librbd/mirror/DemoteRequest.cc b/src/librbd/mirror/DemoteRequest.cc
index 350a76d83421d4bffaf9c4fcfa1482e39122a801..fd24bb69896019fe9a3fe03b14b02122dcd859c4 100644 (file)
--- 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 <shared_mutex> // 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 09378ce58b895b46b90b87f54254f78afe4996c6..3953de265d5eed686e46e3f76629d83fd09d7c3d 100644 (file)
--- 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 <shared_mutex> // 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 2db8aaa84c59b3931c8cdbb95a32376affda17bc..e904a21bba1c09e61157b8984b391db113306806 100644 (file)
--- 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 <shared_mutex> // 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 eed0aa506a303c24f3322c7bde1a2bda618ac581..f7dbe405d50711d01c2f90f203c069db11ebabe0 100644 (file)
--- 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 <shared_mutex> // 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 c8e3a4fe7a6e6f4abbac7dec654a1c61dd60e50e..1e4391d2a259f4385cd36bb926cfbbb22beef822 100644 (file)
--- 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 <shared_mutex> // 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 9718c299e03787262dbc082d3b87457803e747eb..1a6b1c81bc43db14074c7d59fafd5185f76633c5 100644 (file)
--- 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 <shared_mutex> // 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 9fcee0322918c0ca1cefacc72680303d2d7023f4..fee05ef0146df83b5e3939aa26ff8b3b8c099571 100644 (file)
--- a/src/librbd/mirror/snapshot/SetImageStateRequest.cc
+++ b/src/librbd/mirror/snapshot/SetImageStateRequest.cc
@@ -12,6 +12,8 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <shared_mutex> // 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 36d1558be4302a743810c544a3dd2e85d85b7586..9b8afbd59fab7f4d873a89363156d76bacf1ee21 100644 (file)
--- 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 <shared_mutex> // 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 acaf31a39bfbf6bbcc6c1cdef29480c76e89f863..505bd67f13f28f650f931dff64a6d67eb3be7c69 100644 (file)
--- 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 <shared_mutex> // for std::shared_lock
 #include <string>
 
 #define dout_subsys ceph_subsys_rbd

diff --git a/src/librbd/object_map/DiffRequest.h b/src/librbd/object_map/DiffRequest.h
index 740f4e02a11742b279fb12c3a5eb5ed9041907fc..7739beb3bc892a46afcf03ad957a3d4d80ca9289 100644 (file)
--- 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 <set>
+#include <shared_mutex> // for std::shared_lock
 
 struct Context;
 

diff --git a/src/librbd/object_map/RefreshRequest.cc b/src/librbd/object_map/RefreshRequest.cc
index 1527f07c7d7d4ed18e3c412cb67e7900f1b9d40d..3d84be2d6227330fff9ca644d1e6a8cc97009a3e 100644 (file)
--- 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 <shared_mutex> // 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 1e1aab2ae5c03d6b3f55afa087274bb77850fbaf..c4f36733b2b01104e1b65a979102582263e5acf5 100644 (file)
--- 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 <shared_mutex> // 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 3b2e7ee82966664e259ad08d80f64e0b46e03217..cccbeb60f62e144d50113ea876dd8dcee6802b46 100644 (file)
--- 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 <iostream>
+#include <shared_mutex> // 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 1c2ffc753f275a7866c35cee5a9884e3ae6fd9bd..60b903719eff2aff3df3a35f5bdf98e59b33c5f4 100644 (file)
--- 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 <shared_mutex> // 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 7c2f441cc3ac99e63ab547a1d727f3a0d05bc0d9..0bd2b1727d0b0aa36f3747ed354ce265c9ee7565 100644 (file)
--- 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 <iostream>
+#include <shared_mutex> // 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 30a1f2121bd1ba2c35d87fdcb0b4e344be10535d..c0fa27a353a543bce109213415c0482f03b6b1e4 100644 (file)
--- 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 <shared_mutex> // for std::shared_lock
 #include <string>
 
 #define dout_subsys ceph_subsys_rbd

diff --git a/src/librbd/operation/FlattenRequest.cc b/src/librbd/operation/FlattenRequest.cc
index 8034637e8e6d7bc873145b659f61852ecd7ed874..14789e95515915e10c2e9d1bd93b4f0384210760 100644 (file)
--- a/src/librbd/operation/FlattenRequest.cc
+++ b/src/librbd/operation/FlattenRequest.cc
@@ -18,6 +18,8 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
 
+#include <shared_mutex> // 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 2b9adb7737807d13d125ff0849e2992349e10761..5642994ea934d1b42aad7b62a0d99037a2f56f5e 100644 (file)
--- a/src/librbd/operation/MigrateRequest.cc
+++ b/src/librbd/operation/MigrateRequest.cc
@@ -16,6 +16,8 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
 
+#include <shared_mutex> // 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 50db3df851fb7ec178af32c662b80aaf70dc3994..2419233dca7e901ad775322537e54c97ad4e8437 100644 (file)
--- a/src/librbd/operation/ObjectMapIterate.cc
+++ b/src/librbd/operation/ObjectMapIterate.cc
@@ -17,6 +17,8 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
 
+#include <shared_mutex> // 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 5deb182e5602acc021e6eff1c422e7c51016b6ea..aa159a1d8e50abc445367fc6c321509d7db78a54 100644 (file)
--- a/src/librbd/operation/RebuildObjectMapRequest.cc
+++ b/src/librbd/operation/RebuildObjectMapRequest.cc
@@ -17,6 +17,8 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
 
+#include <shared_mutex> // 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 15bcd819cf55adbdf572d6d21dd579e414781324..bcd6d1b0f6c28ccd083d9c20c8e1fa20f96a54fe 100644 (file)
--- 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 <shared_mutex> // 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 269c8a4f99992290e841b50604b36fa79fe63e42..49f3e6bcca9fc2b4a61a910758d0fa39cb4374a8 100644 (file)
--- 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 <shared_mutex> // 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 1f09ea3082f24790858dc82e278b2d86c66ba7cd..b69fe4f194338af0470cfe20da2ce4165991bcf4 100644 (file)
--- 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 <shared_mutex> // 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 8cea35d2f035e012b76b1f668e2f18bbafa342fa..111b4c17ab824ca23d3670dfbb5b15c05932505e 100644 (file)
--- 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 <shared_mutex> // 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 17aed5f6a501537711d5dbc97f56e690003a62f0..2a887b420c11bcb985486c5ebfc873423754d371 100644 (file)
--- 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 <shared_mutex> // 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 f3b9e7e0b76f3eb0eafe154ba209cd9da15a078f..88f4bb156016b383c497d6ce18ba5515841540c2 100644 (file)
--- 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 <shared_mutex> // 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 f3b4dc62e046bfdae180866731f1742a1ccf491c..c8f53d50f4c2f8f78543bc18db7f36a4df260382 100644 (file)
--- 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 <shared_mutex> // 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 e9257f18c021f6d4c9ef92e1bdb7a148026a3a0e..8a79f26f151e37ef9e4969f802d2ce80caca4ffe 100644 (file)
--- 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 <shared_mutex> // 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 87c5212deac58b51116e52dd1e9db3be64a37f77..17501999c9467548f49885e37a700a113a8369ed 100644 (file)
--- a/src/librbd/operation/SnapshotRollbackRequest.cc
+++ b/src/librbd/operation/SnapshotRollbackRequest.cc
@@ -16,6 +16,8 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
 
+#include <shared_mutex> // 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 76caf68f335e8bdc00c533512f0daca00f34db69..addd3c8e68186a9b2f5fcf75f608df1bf8fbdb87 100644 (file)
--- a/src/librbd/operation/SnapshotUnprotectRequest.cc
+++ b/src/librbd/operation/SnapshotUnprotectRequest.cc
@@ -13,6 +13,7 @@
 #include "librbd/Utils.h"
 #include <list>
 #include <set>
+#include <shared_mutex> // for std::shared_lock
 #include <vector>
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>

diff --git a/src/librbd/operation/SparsifyRequest.cc b/src/librbd/operation/SparsifyRequest.cc
index ef7fc78f502fa698db18f8f7808aade55d4cc982..c4f2e6f44416e549f1fa82a651a4c4bcaae5f1bc 100644 (file)
--- a/src/librbd/operation/SparsifyRequest.cc
+++ b/src/librbd/operation/SparsifyRequest.cc
@@ -16,6 +16,8 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
 
+#include <shared_mutex> // 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 6c6685f2b757f2582c25de06ba3c863fca4a7347..adfe7967a3660109c3bb109d1ffa919765cf62b4 100644 (file)
--- a/src/librbd/operation/TrimRequest.cc
+++ b/src/librbd/operation/TrimRequest.cc
@@ -19,6 +19,8 @@
 #include <boost/lambda/construct.hpp>
 #include <boost/scope_exit.hpp>
 
+#include <shared_mutex> // 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 d1517fb0f5d887c72b551ee5d8d90c0819b51009..615872dc665080aedfd69c912abc670f3922d34f 100644 (file)
--- 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 <iosfwd>
+#include <map>
+#include <vector>
+
 namespace ceph { class Formatter; }
 
 namespace librbd {