From 0ca8071e13492a9124be8322843cd96ca2bba531 Mon Sep 17 00:00:00 2001 From: shawn Date: Mon, 6 Jun 2016 03:37:22 -0400 Subject: [PATCH] librbd: optimize object-map header file dependency Signed-off-by: Xiaowei Chen (cherry picked from commit 1a2276927d5956918f7a4830b4a44048ac090328) --- src/librbd/object_map/InvalidateRequest.cc | 2 -- src/librbd/object_map/LockRequest.h | 4 ++-- src/librbd/object_map/RefreshRequest.cc | 3 --- src/librbd/object_map/RefreshRequest.h | 3 ++- src/librbd/object_map/Request.cc | 3 --- src/librbd/object_map/SnapshotCreateRequest.cc | 1 - src/librbd/object_map/SnapshotRollbackRequest.cc | 1 - src/librbd/object_map/UnlockRequest.h | 5 +---- src/librbd/object_map/UpdateRequest.cc | 1 - 9 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/librbd/object_map/InvalidateRequest.cc b/src/librbd/object_map/InvalidateRequest.cc index 41ef46cdf586a..e60d04fe099a7 100644 --- a/src/librbd/object_map/InvalidateRequest.cc +++ b/src/librbd/object_map/InvalidateRequest.cc @@ -3,10 +3,8 @@ #include "librbd/object_map/InvalidateRequest.h" #include "common/dout.h" -#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/object_map/LockRequest.h b/src/librbd/object_map/LockRequest.h index 04c9a094345cf..0333548e65167 100644 --- a/src/librbd/object_map/LockRequest.h +++ b/src/librbd/object_map/LockRequest.h @@ -4,12 +4,12 @@ #ifndef CEPH_LIBRBD_OBJECT_MAP_LOCK_REQUEST_H #define CEPH_LIBRBD_OBJECT_MAP_LOCK_REQUEST_H -#include "include/int_types.h" #include "include/buffer.h" -#include "include/Context.h" #include "cls/lock/cls_lock_types.h" #include +class Context; + namespace librbd { class ImageCtx; diff --git a/src/librbd/object_map/RefreshRequest.cc b/src/librbd/object_map/RefreshRequest.cc index 1bd465e10bebf..9421c1216c4b1 100644 --- a/src/librbd/object_map/RefreshRequest.cc +++ b/src/librbd/object_map/RefreshRequest.cc @@ -2,12 +2,9 @@ // vim: ts=8 sw=2 smarttab #include "librbd/object_map/RefreshRequest.h" -#include "cls/rbd/cls_rbd_client.h" -#include "cls/rbd/cls_rbd_types.h" #include "cls/lock/cls_lock_client.h" #include "common/dout.h" #include "common/errno.h" -#include "common/WorkQueue.h" #include "librbd/ImageCtx.h" #include "librbd/ObjectMap.h" #include "librbd/object_map/InvalidateRequest.h" diff --git a/src/librbd/object_map/RefreshRequest.h b/src/librbd/object_map/RefreshRequest.h index 9ae1f270d83f7..4c2b059fa268f 100644 --- a/src/librbd/object_map/RefreshRequest.h +++ b/src/librbd/object_map/RefreshRequest.h @@ -6,9 +6,10 @@ #include "include/int_types.h" #include "include/buffer.h" -#include "include/Context.h" #include "common/bit_vector.hpp" +class Context; + namespace librbd { class ImageCtx; diff --git a/src/librbd/object_map/Request.cc b/src/librbd/object_map/Request.cc index 48cd99faf5406..1725cbf907541 100644 --- a/src/librbd/object_map/Request.cc +++ b/src/librbd/object_map/Request.cc @@ -2,13 +2,10 @@ // vim: ts=8 sw=2 smarttab #include "librbd/object_map/Request.h" -#include "include/rados/librados.hpp" -#include "include/rbd/librbd.hpp" #include "common/dout.h" #include "common/errno.h" #include "common/RWLock.h" #include "librbd/ImageCtx.h" -#include "librbd/ImageWatcher.h" #include "librbd/object_map/InvalidateRequest.h" #define dout_subsys ceph_subsys_rbd diff --git a/src/librbd/object_map/SnapshotCreateRequest.cc b/src/librbd/object_map/SnapshotCreateRequest.cc index abca0e21258ac..6408973416fa0 100644 --- a/src/librbd/object_map/SnapshotCreateRequest.cc +++ b/src/librbd/object_map/SnapshotCreateRequest.cc @@ -3,7 +3,6 @@ #include "librbd/object_map/SnapshotCreateRequest.h" #include "common/dout.h" -#include "common/errno.h" #include "librbd/ImageCtx.h" #include "librbd/ObjectMap.h" #include "cls/lock/cls_lock_client.h" diff --git a/src/librbd/object_map/SnapshotRollbackRequest.cc b/src/librbd/object_map/SnapshotRollbackRequest.cc index 9d4fc4a1c3ceb..10eb59136d381 100644 --- a/src/librbd/object_map/SnapshotRollbackRequest.cc +++ b/src/librbd/object_map/SnapshotRollbackRequest.cc @@ -3,7 +3,6 @@ #include "librbd/object_map/SnapshotRollbackRequest.h" #include "common/dout.h" -#include "common/errno.h" #include "librbd/ImageCtx.h" #include "librbd/ObjectMap.h" #include "librbd/object_map/InvalidateRequest.h" diff --git a/src/librbd/object_map/UnlockRequest.h b/src/librbd/object_map/UnlockRequest.h index 14535403381d0..b52a3d0f89e97 100644 --- a/src/librbd/object_map/UnlockRequest.h +++ b/src/librbd/object_map/UnlockRequest.h @@ -4,10 +4,7 @@ #ifndef CEPH_LIBRBD_OBJECT_MAP_UNLOCK_REQUEST_H #define CEPH_LIBRBD_OBJECT_MAP_UNLOCK_REQUEST_H -#include "include/int_types.h" -#include "include/buffer.h" -#include "include/Context.h" -#include +class Context; namespace librbd { diff --git a/src/librbd/object_map/UpdateRequest.cc b/src/librbd/object_map/UpdateRequest.cc index 5dd1e53172b84..51dbc48827f5b 100644 --- a/src/librbd/object_map/UpdateRequest.cc +++ b/src/librbd/object_map/UpdateRequest.cc @@ -5,7 +5,6 @@ #include "include/rbd/object_map_types.h" #include "include/stringify.h" #include "common/dout.h" -#include "common/errno.h" #include "librbd/ImageCtx.h" #include "librbd/ObjectMap.h" #include "cls/lock/cls_lock_client.h" -- 2.39.5