From c49398dcd92bab90ab852407427bcc2c23147779 Mon Sep 17 00:00:00 2001 From: shawn Date: Tue, 7 Jun 2016 03:12:55 -0400 Subject: [PATCH] librbd: optimize operation header file dependency Signed-off-by: Xiaowei Chen (cherry picked from commit 88afa408683238b803606f3d63de326ead8cefee) --- src/librbd/operation/FlattenRequest.cc | 2 -- src/librbd/operation/RebuildObjectMapRequest.cc | 1 - src/librbd/operation/RenameRequest.h | 1 - src/librbd/operation/Request.cc | 2 -- src/librbd/operation/Request.h | 1 - src/librbd/operation/ResizeRequest.cc | 1 - src/librbd/operation/SnapshotCreateRequest.cc | 1 - src/librbd/operation/SnapshotCreateRequest.h | 1 - src/librbd/operation/SnapshotProtectRequest.h | 1 - src/librbd/operation/SnapshotRemoveRequest.cc | 1 - src/librbd/operation/SnapshotRenameRequest.cc | 1 - src/librbd/operation/SnapshotRenameRequest.h | 1 - src/librbd/operation/SnapshotRollbackRequest.h | 2 +- src/librbd/operation/SnapshotUnprotectRequest.h | 1 - src/librbd/operation/TrimRequest.cc | 1 - 15 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/librbd/operation/FlattenRequest.cc b/src/librbd/operation/FlattenRequest.cc index 59bdb29302aa7..85433aeaa3643 100644 --- 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 diff --git a/src/librbd/operation/RebuildObjectMapRequest.cc b/src/librbd/operation/RebuildObjectMapRequest.cc index da2e744ce9043..352a439a83bd8 100644 --- 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 c2fa14eb04d1b..95f66588bb4de 100644 --- 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 #include class Context; diff --git a/src/librbd/operation/Request.cc b/src/librbd/operation/Request.cc index 32391a9c5a3a5..f1ad960d0c444 100644 --- 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 77a8712e5ebf1..6a09cb1d63921 100644 --- 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 a0687eb87d2a9..1c3dee7bf825c 100644 --- 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 c3dde26fc4e89..4f20ec4f977f1 100644 --- 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 62256bb30ef38..c239d601eaebb 100644 --- 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 #include class Context; diff --git a/src/librbd/operation/SnapshotProtectRequest.h b/src/librbd/operation/SnapshotProtectRequest.h index e8abfb27eb915..b905ff50f4a09 100644 --- 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 #include class Context; diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc index 8ad123b2a1063..9bc45679896c0 100644 --- 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 f825d8cf37475..c7148c8961af0 100644 --- 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 452862926801f..0b512ecb57585 100644 --- 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 #include class Context; diff --git a/src/librbd/operation/SnapshotRollbackRequest.h b/src/librbd/operation/SnapshotRollbackRequest.h index 53fb85b2fa3bf..135ba97945518 100644 --- 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 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 62467f25b2662..c9f5b335ade9f 100644 --- 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 #include class Context; diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc index 3ed96f792e38c..d1d8dc804d46c 100644 --- 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" -- 2.39.5