librbd: optimize operation header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>

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 aa65618b60ae9c3d57dd1692b2fea17218bfb221..281c24c598e4ed24c46ebf035d2b018f901e6ca2 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 216da1a983aef208262c70ab74f0350fc23cd480..e390b412ccb0187014a08d6d067c753e56b86aa3 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 be4d174be5d710153ef32e48232f927d49cd4587..d7f0e3f99582fd757378bf4ddcb292dce0ea19b5 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 a2ee7b0ebe5e4ae6e09daf5534c71c0daaed1724..f7e5ba33a2d6108f90a1d98f1aee26cf460828db 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 cb92c6cac7646b0c53f95079eea61a9ebb51a087..5e1a75069a15dddf288c17cf67565e72608a2aa4 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 35f8b53d60abc2894cd6c2fc26079b8349c473e5..c93f685abf5ba53683cdc52aead2043f1e82418f 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 ec7eb653c37dfcdfd619980c1b4b10390e888962..209a46c80bf8dddcc692a1f4aeb859bfa31cb307 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 503058d0b37adc066006a913e077759453ba0726..e500ec07bc3ed5cdf96783ae771f5fd897e646cf 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"