From: shawn <cxwshawn@gmail.com>
Date: Tue, 7 Jun 2016 05:59:05 +0000 (-0400)
Subject: librbd: optimize journal header file dependency
X-Git-Tag: v10.2.3~48^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5366973897c1103a1c291c2f886692da4170d901;p=ceph.git

librbd: optimize journal header file dependency

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

diff --git a/src/librbd/journal/Replay.cc b/src/librbd/journal/Replay.cc
index fb506ec3d72c..de33e03991de 100644
--- a/src/librbd/journal/Replay.cc
+++ b/src/librbd/journal/Replay.cc
@@ -9,7 +9,6 @@
 #include "librbd/AioImageRequest.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/ImageState.h"
-#include "librbd/ImageWatcher.h"
 #include "librbd/internal.h"
 #include "librbd/Operations.h"
 #include "librbd/Utils.h"
diff --git a/src/librbd/journal/Replay.h b/src/librbd/journal/Replay.h
index 8490d3cc98ad..30642db1f365 100644
--- a/src/librbd/journal/Replay.h
+++ b/src/librbd/journal/Replay.h
@@ -7,13 +7,11 @@
 #include "include/int_types.h"
 #include "include/buffer_fwd.h"
 #include "include/Context.h"
-#include "include/rbd/librbd.hpp"
 #include "common/Mutex.h"
 #include "librbd/AioCompletion.h"
 #include "librbd/journal/Types.h"
 #include <boost/variant.hpp>
 #include <list>
-#include <set>
 #include <unordered_set>
 #include <unordered_map>