From: shawn <cxwshawn@gmail.com>
Date: Mon, 6 Jun 2016 07:37:22 +0000 (-0400)
Subject: librbd: optimize object-map header file dependency
X-Git-Tag: v10.2.3~48^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ca8071e13492a9124be8322843cd96ca2bba531;p=ceph.git

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 41ef46cdf58..e60d04fe099 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 04c9a094345..0333548e651 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 <map>
 
+class Context;
+
 namespace librbd {
 
 class ImageCtx;
diff --git a/src/librbd/object_map/RefreshRequest.cc b/src/librbd/object_map/RefreshRequest.cc
index 1bd465e10be..9421c1216c4 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 9ae1f270d83..4c2b059fa26 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 48cd99faf54..1725cbf9075 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 abca0e21258..6408973416f 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 9d4fc4a1c3c..10eb59136d3 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 14535403381..b52a3d0f89e 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 <map>
+class Context;
 
 namespace librbd {
 
diff --git a/src/librbd/object_map/UpdateRequest.cc b/src/librbd/object_map/UpdateRequest.cc
index 5dd1e53172b..51dbc48827f 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"