summaryrefslogtreecommitdiffstats
path: root/src/librbd/librbd.cc
diff options
context:
space:
mode:
authorCasey Bodley <cbodley@redhat.com>2023-12-08 17:24:54 +0100
committerCasey Bodley <cbodley@redhat.com>2023-12-08 17:24:57 +0100
commit4304ca95d3aa2ff009498e792ee09f4d84566ad3 (patch)
tree5dc6a7581a6141d3fe07b225e2e134fc18ad8554 /src/librbd/librbd.cc
parentMerge pull request #54751 from zdover23/wip-doc-2023-12-02-radosgw-multisite-... (diff)
downloadceph-4304ca95d3aa2ff009498e792ee09f4d84566ad3.tar.xz
ceph-4304ca95d3aa2ff009498e792ee09f4d84566ad3.zip
librbd: include asio strand headers in librbd.cc
Fixes: https://tracker.ceph.com/issues/63682 Signed-off-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to '')
-rw-r--r--src/librbd/librbd.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc
index 1272d95dd7e..132a0084a9f 100644
--- a/src/librbd/librbd.cc
+++ b/src/librbd/librbd.cc
@@ -15,6 +15,12 @@
#include <errno.h>
+// these strand headers declare static variables that need to be shared between
+// librbd.so and librados.so. referencing them here causes librbd.so to link
+// their symbols as 'global unique'. see https://tracker.ceph.com/issues/63682
+#include <boost/asio/strand.hpp>
+#include <boost/asio/io_context_strand.hpp>
+
#include "common/deleter.h"
#include "common/dout.h"
#include "common/errno.h"