From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 28 Jun 2016 12:20:10 +0000 (-0400)
Subject: Merge pull request #9539 from cxwshawn/wip-tc9-fix
X-Git-Tag: v11.0.0~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2066ad818fceaa5c9a456fa2bc395671d6538fd8;p=ceph.git

Merge pull request #9539 from cxwshawn/wip-tc9-fix

librbd: optimize header file dependency and modify related files

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

2066ad818fceaa5c9a456fa2bc395671d6538fd8
diff --cc src/librbd/Journal.h
index 7f085dfc6c4a,9d51a45e6d64..d2b7ccb185f7
--- a/src/librbd/Journal.h
+++ b/src/librbd/Journal.h
@@@ -8,10 -8,8 +8,9 @@@
  #include "include/atomic.h"
  #include "include/Context.h"
  #include "include/interval_set.h"
- #include "include/rados/librados.hpp"
  #include "common/Mutex.h"
  #include "journal/Future.h"
 +#include "journal/JournalMetadataListener.h"
  #include "journal/ReplayEntry.h"
  #include "journal/ReplayHandler.h"
  #include "librbd/journal/Types.h"