librbd/migration: don't include ImageState.h in formats

src_image_ctx, whether dummy for RawFormat and QCOWFormat or real for
NativeFormat, is managed by OpenSourceImageRequest.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 8e58a52a408b703b79342670acbeb6c7303ddde7)

Conflicts:
	src/librbd/migration/NativeFormat.cc [ commit 293d523ea69a
	  ("librbd/migration: add external clusters support") not in
	  squid ]

diff --git a/src/librbd/migration/NativeFormat.cc b/src/librbd/migration/NativeFormat.cc
index 51248b95e26eae85955e77fa9b118a33bfd810fe..2829169ab0ca51de91e12a79964e7752f26706a0 100644 (file)
--- a/src/librbd/migration/NativeFormat.cc
+++ b/src/librbd/migration/NativeFormat.cc
@@ -6,7 +6,6 @@
 #include "common/dout.h"
 #include "common/errno.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageState.h"
 #include "librbd/Utils.h"
 #include "librbd/asio/ContextWQ.h"
 #include "librbd/io/ImageDispatchSpec.h"

diff --git a/src/librbd/migration/QCOWFormat.cc b/src/librbd/migration/QCOWFormat.cc
index b2e277ad3762ea381dd142c4721e69e30ec985f0..5395c5c6925b9143bab465cfd09e36a14cac0d48 100644 (file)
--- a/src/librbd/migration/QCOWFormat.cc
+++ b/src/librbd/migration/QCOWFormat.cc
@@ -8,7 +8,6 @@
 #include "include/intarith.h"
 #include "librbd/AsioEngine.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageState.h"
 #include "librbd/Utils.h"
 #include "librbd/io/AioCompletion.h"
 #include "librbd/io/ReadResult.h"

diff --git a/src/librbd/migration/RawFormat.cc b/src/librbd/migration/RawFormat.cc
index 2c60b163cc390bc4eb1d990dfff49283aa9bb0ab..8a296a32c276497a625b1095c3a972b8fc4bf61a 100644 (file)
--- a/src/librbd/migration/RawFormat.cc
+++ b/src/librbd/migration/RawFormat.cc
@@ -5,7 +5,6 @@
 #include "common/dout.h"
 #include "common/errno.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/ImageState.h"
 #include "librbd/Utils.h"
 #include "librbd/io/AioCompletion.h"
 #include "librbd/io/ReadResult.h"