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>

diff --cc src/librbd/AioImageRequest.cc
Simple merge

diff --cc src/librbd/AioObjectRequest.cc
Simple merge

diff --cc src/librbd/ExclusiveLock.h
Simple merge

diff --cc src/librbd/ImageCtx.cc
Simple merge

diff --cc src/librbd/ImageWatcher.cc
Simple merge

diff --cc src/librbd/ImageWatcher.h
Simple merge

diff --cc src/librbd/Journal.cc
Simple merge

diff --cc src/librbd/Journal.h
index 7f085dfc6c4ab3314267a04d032d983996cb994c,9d51a45e6d641347bec00fd58a5480567ae79313..d2b7ccb185f7a0a2d165fcea03a86fbbb518846f
--- 1/src/librbd/Journal.h
--- 2/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"

diff --cc src/librbd/Operations.cc
Simple merge

diff --cc src/librbd/TaskFinisher.h
Simple merge

diff --cc src/librbd/Utils.h
Simple merge

diff --cc src/librbd/exclusive_lock/ReleaseRequest.cc
Simple merge

diff --cc src/librbd/image/OpenRequest.cc
Simple merge

diff --cc src/librbd/image/RefreshRequest.cc
Simple merge

diff --cc src/librbd/image/RefreshRequest.h
Simple merge

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/librbd/journal/Replay.cc
Simple merge

diff --cc src/librbd/journal/Replay.h
Simple merge

diff --cc src/librbd/librbd.cc
Simple merge