From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 8 Dec 2023 16:24:54 +0000 (-0500)
Subject: librbd: include asio strand headers in librbd.cc
X-Git-Tag: v19.3.0~412^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4304ca95d3aa2ff009498e792ee09f4d84566ad3;p=ceph.git

librbd: include asio strand headers in librbd.cc

Fixes: https://tracker.ceph.com/issues/63682

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc
index 1272d95dd7e5..132a0084a9f6 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"