librbd: optimize operation header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit 88afa408683238b803606f3d63de326ead8cefee)

diff --git a/src/librbd/operation/FlattenRequest.cc b/src/librbd/operation/FlattenRequest.cc
index 59bdb29302aa7e63c4f142f1268b3a158894478c..85433aeaa36431c3665464da37709a1c1eb90cd8 100644 (file)
--- a/src/librbd/operation/FlattenRequest.cc
+++ b/src/librbd/operation/FlattenRequest.cc
@@ -6,8 +6,6 @@
 #include "librbd/AsyncObjectThrottle.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageWatcher.h"
-#include "librbd/ObjectMap.h"
 #include "common/dout.h"
 #include "common/errno.h"
 #include <boost/lambda/bind.hpp>

diff --git a/src/librbd/operation/RebuildObjectMapRequest.cc b/src/librbd/operation/RebuildObjectMapRequest.cc
index da2e744ce90432f8127a4f84761c460f82ff78bc..352a439a83bd8075330caf4658ad894ee53093a5 100644 (file)
--- a/src/librbd/operation/RebuildObjectMapRequest.cc
+++ b/src/librbd/operation/RebuildObjectMapRequest.cc
@@ -7,7 +7,6 @@
 #include "librbd/AsyncObjectThrottle.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageWatcher.h"
 #include "librbd/internal.h"
 #include "librbd/ObjectMap.h"
 #include "librbd/operation/ResizeRequest.h"

diff --git a/src/librbd/operation/RenameRequest.h b/src/librbd/operation/RenameRequest.h
index c2fa14eb04d1b69905474631c38d330995e0f60b..95f66588bb4def46539ae8815fb177744a9c8e0b 100644 (file)
--- a/src/librbd/operation/RenameRequest.h
+++ b/src/librbd/operation/RenameRequest.h
@@ -5,7 +5,6 @@
 #define CEPH_LIBRBD_RENAME_REQUEST_H
 
 #include "librbd/operation/Request.h"
-#include <iosfwd>
 #include <string>
 
 class Context;

diff --git a/src/librbd/operation/Request.cc b/src/librbd/operation/Request.cc
index 32391a9c5a3a55c7fca4daa0afd776b74cc8fbce..f1ad960d0c444d92c69b795847dcf67bf0d7103b 100644 (file)
--- a/src/librbd/operation/Request.cc
+++ b/src/librbd/operation/Request.cc
@@ -6,8 +6,6 @@
 #include "common/errno.h"
 #include "common/WorkQueue.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/Journal.h"
-#include "librbd/Utils.h"
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix

diff --git a/src/librbd/operation/Request.h b/src/librbd/operation/Request.h
index 77a8712e5ebf146e4de8fe66f99755aff5548669..6a09cb1d63921811d51c4f179c06bb40f4759a53 100644 (file)
--- a/src/librbd/operation/Request.h
+++ b/src/librbd/operation/Request.h
@@ -9,7 +9,6 @@
 #include "common/RWLock.h"
 #include "librbd/Utils.h"
 #include "librbd/Journal.h"
-#include "librbd/journal/Types.h"
 
 namespace librbd {
 

diff --git a/src/librbd/operation/ResizeRequest.cc b/src/librbd/operation/ResizeRequest.cc
index a0687eb87d2a94fe5a18bfaa37216efc688fc54a..1c3dee7bf825c6028fb7521c485430b0ae8dceae 100644 (file)
--- a/src/librbd/operation/ResizeRequest.cc
+++ b/src/librbd/operation/ResizeRequest.cc
@@ -5,7 +5,6 @@
 #include "librbd/AioImageRequestWQ.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageWatcher.h"
 #include "librbd/internal.h"
 #include "librbd/ObjectMap.h"
 #include "librbd/Utils.h"

diff --git a/src/librbd/operation/SnapshotCreateRequest.cc b/src/librbd/operation/SnapshotCreateRequest.cc
index c3dde26fc4e89520a24efa10756de73997430af5..4f20ec4f977f10ad437a8f8408b379161557839c 100644 (file)
--- a/src/librbd/operation/SnapshotCreateRequest.cc
+++ b/src/librbd/operation/SnapshotCreateRequest.cc
@@ -7,7 +7,6 @@
 #include "librbd/AioImageRequestWQ.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageWatcher.h"
 #include "librbd/ObjectMap.h"
 #include "librbd/Utils.h"
 

diff --git a/src/librbd/operation/SnapshotCreateRequest.h b/src/librbd/operation/SnapshotCreateRequest.h
index 62256bb30ef387f1b8c68d35f6c8586ef3097c3b..c239d601eaebb22b1d9d1c7165761598bf0728c4 100644 (file)
--- a/src/librbd/operation/SnapshotCreateRequest.h
+++ b/src/librbd/operation/SnapshotCreateRequest.h
@@ -6,7 +6,6 @@
 
 #include "librbd/operation/Request.h"
 #include "librbd/parent_types.h"
-#include <iosfwd>
 #include <string>
 
 class Context;

diff --git a/src/librbd/operation/SnapshotProtectRequest.h b/src/librbd/operation/SnapshotProtectRequest.h
index e8abfb27eb9150994cc5e86be5b09555437f09b0..b905ff50f4a09c606067e94b4a0955d3a87cc902 100644 (file)
--- a/src/librbd/operation/SnapshotProtectRequest.h
+++ b/src/librbd/operation/SnapshotProtectRequest.h
@@ -5,7 +5,6 @@
 #define CEPH_LIBRBD_OPERATION_SNAPSHOT_PROTECT_REQUEST_H
 
 #include "librbd/operation/Request.h"
-#include <iosfwd>
 #include <string>
 
 class Context;

diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc
index 8ad123b2a1063b8f8673d08186549df046ff13b0..9bc45679896c00bdcc658e3a050da953386e21e9 100644 (file)
--- a/src/librbd/operation/SnapshotRemoveRequest.cc
+++ b/src/librbd/operation/SnapshotRemoveRequest.cc
@@ -6,7 +6,6 @@
 #include "common/errno.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageWatcher.h"
 #include "librbd/ObjectMap.h"
 
 #define dout_subsys ceph_subsys_rbd

diff --git a/src/librbd/operation/SnapshotRenameRequest.cc b/src/librbd/operation/SnapshotRenameRequest.cc
index f825d8cf3747531778d6760f91fe647b528c8a59..c7148c8961af0a5ce9807593f48378fd2bcab5ae 100644 (file)
--- a/src/librbd/operation/SnapshotRenameRequest.cc
+++ b/src/librbd/operation/SnapshotRenameRequest.cc
@@ -6,7 +6,6 @@
 #include "common/errno.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageWatcher.h"
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix

diff --git a/src/librbd/operation/SnapshotRenameRequest.h b/src/librbd/operation/SnapshotRenameRequest.h
index 452862926801f2bb91757e2e90a0c04631ea747c..0b512ecb57585d087764d5a4b32d3092cc43aa50 100644 (file)
--- a/src/librbd/operation/SnapshotRenameRequest.h
+++ b/src/librbd/operation/SnapshotRenameRequest.h
@@ -5,7 +5,6 @@
 #define CEPH_LIBRBD_OPERATION_SNAPSHOT_RENAME_REQUEST_H
 
 #include "librbd/operation/Request.h"
-#include <iosfwd>
 #include <string>
 
 class Context;

diff --git a/src/librbd/operation/SnapshotRollbackRequest.h b/src/librbd/operation/SnapshotRollbackRequest.h
index 53fb85b2fa3bfd6fe52e453062d8d4317c32acb3..135ba97945518acfd2a4eb440665f669487cf12c 100644 (file)
--- a/src/librbd/operation/SnapshotRollbackRequest.h
+++ b/src/librbd/operation/SnapshotRollbackRequest.h
@@ -7,13 +7,13 @@
 #include "librbd/operation/Request.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/internal.h"
+#include "librbd/journal/Types.h"
 #include <string>
 
 class Context;
 
 namespace librbd {
 
-class ImageCtx;
 class ProgressContext;
 
 namespace operation {

diff --git a/src/librbd/operation/SnapshotUnprotectRequest.h b/src/librbd/operation/SnapshotUnprotectRequest.h
index 62467f25b266222c7d7f34c8d7ebdd0ab1156969..c9f5b335ade9fefd6322a2655ea0f45e97f90ff3 100644 (file)
--- a/src/librbd/operation/SnapshotUnprotectRequest.h
+++ b/src/librbd/operation/SnapshotUnprotectRequest.h
@@ -5,7 +5,6 @@
 #define CEPH_LIBRBD_OPERATION_SNAPSHOT_UNPROTECT_REQUEST_H
 
 #include "librbd/operation/Request.h"
-#include <iosfwd>
 #include <string>
 
 class Context;

diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc
index 3ed96f792e38c9e7d40d22a71f23fbfe67a57d85..d1d8dc804d46ca0dcea9584c641a9574bb213e57 100644 (file)
--- a/src/librbd/operation/TrimRequest.cc
+++ b/src/librbd/operation/TrimRequest.cc
@@ -6,7 +6,6 @@
 #include "librbd/AioObjectRequest.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageWatcher.h"
 #include "librbd/internal.h"
 #include "librbd/ObjectMap.h"
 #include "librbd/Utils.h"