librbd: avoid forward declare CephContext in different ways

clang complains as `include/common_fwd.h` declares in a different way

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/librbd/deep_copy/Utils.h b/src/librbd/deep_copy/Utils.h
index 0681548db0f079fa5c3285a8ffa0484968e5e7b5..268a39daf08d5d1355ada0a0853641e87208aebd 100644 (file)
--- a/src/librbd/deep_copy/Utils.h
+++ b/src/librbd/deep_copy/Utils.h
@@ -4,14 +4,13 @@
 #ifndef CEPH_LIBRBD_DEEP_COPY_UTILS_H
 #define CEPH_LIBRBD_DEEP_COPY_UTILS_H
 
+#include "include/common_fwd.h"
 #include "include/rados/librados.hpp"
 #include "librbd/Types.h"
 #include "librbd/deep_copy/Types.h"
 
 #include <boost/optional.hpp>
 
-struct CephContext;
-
 namespace librbd {
 namespace deep_copy {
 namespace util {

diff --git a/src/librbd/image/GetMetadataRequest.h b/src/librbd/image/GetMetadataRequest.h
index d97ce16107e240d90903083ab7f54fcd92bac865..08fc2de718c3c6d9665af6ca4d91ada5a1d40b62 100644 (file)
--- a/src/librbd/image/GetMetadataRequest.h
+++ b/src/librbd/image/GetMetadataRequest.h
@@ -4,12 +4,12 @@
 #ifndef CEPH_LIBRBD_IMAGE_GET_METADATA_REQUEST_H
 #define CEPH_LIBRBD_IMAGE_GET_METADATA_REQUEST_H
 
+#include "include/common_fwd.h"
 #include "include/rados/librados.hpp"
 #include "include/rbd/librbd.hpp"
 #include <string>
 #include <map>
 
-class CephContext;
 class Context;
 
 namespace librbd {

diff --git a/src/librbd/mirror/GetInfoRequest.h b/src/librbd/mirror/GetInfoRequest.h
index 28308ae954501bf30ac4566ae1a454f676dd91d4..def31a4264ac6cbe2a59444aaa1a55a00003e9d3 100644 (file)
--- a/src/librbd/mirror/GetInfoRequest.h
+++ b/src/librbd/mirror/GetInfoRequest.h
@@ -6,12 +6,12 @@
 
 #include "common/snap_types.h"
 #include "include/buffer.h"
+#include "include/common_fwd.h"
 #include "include/rados/librados.hpp"
 #include "librbd/Types.h"
 #include "librbd/mirror/Types.h"
 #include <string>
 
-class CephContext;
 class ContextWQ;
 struct Context;