From: Ilya Dryomov Date: Sun, 1 Sep 2024 13:50:37 +0000 (+0200) Subject: librbd/migration: don't include ImageState.h in formats X-Git-Tag: testing/wip-vshankar-testing-20241106.074359-squid-debug~53^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f66dbf21f8abc67fef4e08b3c609a74ead1ee66c;p=ceph-ci.git 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 (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 51248b95e26..2829169ab0c 100644 --- 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 b2e277ad376..5395c5c6925 100644 --- 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 2c60b163cc3..8a296a32c27 100644 --- 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"