From: Kefu Chai <kchai@redhat.com>
Date: Tue, 3 Mar 2020 03:56:56 +0000 (+0800)
Subject: librbd: avoid forward declare CephContext in different ways
X-Git-Tag: v15.1.1~112^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d6487e63fc34ca393e888e0e0d1e0dd1326e361;p=ceph.git

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 0681548db0f0..268a39daf08d 100644
--- 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 d97ce16107e2..08fc2de718c3 100644
--- 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 28308ae95450..def31a4264ac 100644
--- 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;