librbd: optimize image header file dependency

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

diff --git a/src/librbd/image/CloseRequest.cc b/src/librbd/image/CloseRequest.cc
index 26c5aab198b2b3cc1722747059c2c9674dcfe2a9..4ee52a5872492c5e92f4bc279c2252e71e2f81f6 100644 (file)
--- a/src/librbd/image/CloseRequest.cc
+++ b/src/librbd/image/CloseRequest.cc
@@ -4,10 +4,8 @@
 #include "librbd/image/CloseRequest.h"
 #include "common/dout.h"
 #include "common/errno.h"
-#include "common/WorkQueue.h"
 #include "librbd/AioImageRequestWQ.h"
 #include "librbd/ExclusiveLock.h"
-#include "librbd/ImageWatcher.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/ImageState.h"
 #include "librbd/ImageWatcher.h"

diff --git a/src/librbd/image/CloseRequest.h b/src/librbd/image/CloseRequest.h
index c22fe2404dc089061c504e0ba370e1a82d0dcc71..e7d21845b7a7e2190fcee9f6e84fcb861f1635ff 100644 (file)
--- a/src/librbd/image/CloseRequest.h
+++ b/src/librbd/image/CloseRequest.h
@@ -4,7 +4,6 @@
 #ifndef CEPH_LIBRBD_IMAGE_CLOSE_REQUEST_H
 #define CEPH_LIBRBD_IMAGE_CLOSE_REQUEST_H
 
-#include "include/int_types.h"
 #include "librbd/ImageCtx.h"
 
 class Context;

diff --git a/src/librbd/image/OpenRequest.cc b/src/librbd/image/OpenRequest.cc
index 7714722cb4e9568c8c8e7b9594e20ddfa2284674..36d740da76f495149e96631a77bb84fbd5d202c4 100644 (file)
--- a/src/librbd/image/OpenRequest.cc
+++ b/src/librbd/image/OpenRequest.cc
@@ -4,7 +4,6 @@
 #include "librbd/image/OpenRequest.h"
 #include "common/dout.h"
 #include "common/errno.h"
-#include "common/WorkQueue.h"
 #include "cls/rbd/cls_rbd_client.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/Utils.h"

diff --git a/src/librbd/image/OpenRequest.h b/src/librbd/image/OpenRequest.h
index cf506ebe9743b185e08d44b2d5571cb04610598b..627285b40ffd703bdc1c24d99cdfe39414ef95cf 100644 (file)
--- a/src/librbd/image/OpenRequest.h
+++ b/src/librbd/image/OpenRequest.h
@@ -4,7 +4,6 @@
 #ifndef CEPH_LIBRBD_IMAGE_OPEN_REQUEST_H
 #define CEPH_LIBRBD_IMAGE_OPEN_REQUEST_H
 
-#include "include/int_types.h"
 #include "include/buffer.h"
 #include <map>
 #include <string>

diff --git a/src/librbd/image/RefreshRequest.cc b/src/librbd/image/RefreshRequest.cc
index ebd86efe7e7730c4e845729d1eb1d1c5ad35e24c..fdab92b6027a323c42c665edd8b1c7e332ebf73f 100644 (file)
--- a/src/librbd/image/RefreshRequest.cc
+++ b/src/librbd/image/RefreshRequest.cc
@@ -2,10 +2,8 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "librbd/image/RefreshRequest.h"
-#include "include/stringify.h"
 #include "common/dout.h"
 #include "common/errno.h"
-#include "common/WorkQueue.h"
 #include "cls/lock/cls_lock_client.h"
 #include "cls/rbd/cls_rbd_client.h"
 #include "librbd/AioImageRequestWQ.h"

diff --git a/src/librbd/image/RefreshRequest.h b/src/librbd/image/RefreshRequest.h
index 58b6487e1e767acd05cd21f49a178ae77ce91741..79b5d9e816d2ed98e30686982f9f5dbc7b4926f5 100644 (file)
--- a/src/librbd/image/RefreshRequest.h
+++ b/src/librbd/image/RefreshRequest.h
@@ -6,7 +6,6 @@
 
 #include "include/int_types.h"
 #include "include/buffer.h"
-#include "include/rbd_types.h"
 #include "common/snap_types.h"
 #include "cls/lock/cls_lock_types.h"
 #include "librbd/ImageCtx.h"

diff --git a/src/librbd/image/SetSnapRequest.h b/src/librbd/image/SetSnapRequest.h
index fa1203236e392188827f53be19874e78eef76b15..1e2df49bcf14ba6c0af7f1f34dde5f12b821ba6f 100644 (file)
--- a/src/librbd/image/SetSnapRequest.h
+++ b/src/librbd/image/SetSnapRequest.h
@@ -4,8 +4,6 @@
 #ifndef CEPH_LIBRBD_IMAGE_SNAP_SET_REQUEST_H
 #define CEPH_LIBRBD_IMAGE_SNAP_SET_REQUEST_H
 
-#include "include/int_types.h"
-#include "librbd/parent_types.h"
 #include <string>
 
 class Context;