librbd: optimize object-map header file dependency

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

diff --git a/src/librbd/object_map/InvalidateRequest.cc b/src/librbd/object_map/InvalidateRequest.cc
index 41ef46cdf586adbdd27e31994ad6e8c1730eafcf..e60d04fe099a7a9f2bbff631eb8f4aae179544fd 100644 (file)
--- 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 04c9a094345cf8d0b698f70279df14d274635d8e..0333548e65167f9d4abc848de897b3ba38666ddc 100644 (file)
--- 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 <map>
 
+class Context;
+
 namespace librbd {
 
 class ImageCtx;

diff --git a/src/librbd/object_map/RefreshRequest.cc b/src/librbd/object_map/RefreshRequest.cc
index 1bd465e10bebfedeaa8785d769f3b9e73fd4216e..9421c1216c4b132301071ee9df5e04800f364ae3 100644 (file)
--- 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 9ae1f270d83f7c43b96be280b1a45bfc731ebd1a..4c2b059fa268f9499a2a9a9c747c4acf1b247374 100644 (file)
--- 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 48cd99faf540695acbe63ba6a398a0a217b677f2..1725cbf907541118a771b8ee7873c96fa6bce0f6 100644 (file)
--- 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 abca0e21258ac12277063bddcd18ecf3771a4440..6408973416fa087b8d6a9637431baa3ee307908e 100644 (file)
--- 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 9d4fc4a1c3ceba59a70905e6de859c6878d99f7f..10eb59136d3810e9cd96a474b267b7447670eaa6 100644 (file)
--- 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 14535403381d028ab9799eb9428a88dff737e09f..b52a3d0f89e975a7266f92c8c85e0aff1c4f8c07 100644 (file)
--- 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 <map>
+class Context;
 
 namespace librbd {
 

diff --git a/src/librbd/object_map/UpdateRequest.cc b/src/librbd/object_map/UpdateRequest.cc
index 5dd1e53172b8428efcb5e54ae8cf7fd3f40106cf..51dbc48827f5b9982b64f78b9822a0abc078f1f7 100644 (file)
--- 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"