update ceph source to reef 18.1.2

[ceph.git] / ceph / src / librbd / cache / ImageWriteback.cc

diff --git a/ceph/src/librbd/cache/ImageWriteback.cc b/ceph/src/librbd/cache/ImageWriteback.cc
index dcbba42ba9ef533d34c40acc4f0deeb325a583dd..40422534ba34aae592c372c26767710c3e5c5e56 100644 (file)
--- a/ceph/src/librbd/cache/ImageWriteback.cc
+++ b/ceph/src/librbd/cache/ImageWriteback.cc
@@ -36,9 +36,8 @@ void ImageWriteback<I>::aio_read(Extents &&image_extents, bufferlist *bl,
   ZTracer::Trace trace;
   auto req = io::ImageDispatchSpec::create_read(
     *image_ctx, io::IMAGE_DISPATCH_LAYER_WRITEBACK_CACHE, aio_comp,
-    std::move(image_extents), io::ReadResult{bl},
-    image_ctx->get_data_io_context(),
-    fadvise_flags, 0, trace);
+    std::move(image_extents), io::ImageArea::DATA, io::ReadResult{bl},
+    image_ctx->get_data_io_context(), fadvise_flags, 0, trace);
   req->send();
 }
 
@@ -56,8 +55,8 @@ void ImageWriteback<I>::aio_write(Extents &&image_extents,
   ZTracer::Trace trace;
   auto req = io::ImageDispatchSpec::create_write(
     *image_ctx, io::IMAGE_DISPATCH_LAYER_WRITEBACK_CACHE, aio_comp,
-    std::move(image_extents), std::move(bl),
-    image_ctx->get_data_io_context(), fadvise_flags, trace);
+    std::move(image_extents), io::ImageArea::DATA, std::move(bl),
+    fadvise_flags, trace);
   req->send();
 }
 
@@ -75,9 +74,8 @@ void ImageWriteback<I>::aio_discard(uint64_t offset, uint64_t length,
       on_finish, image_ctx, io::AIO_TYPE_DISCARD);
   ZTracer::Trace trace;
   auto req = io::ImageDispatchSpec::create_discard(
-    *image_ctx, io::IMAGE_DISPATCH_LAYER_WRITEBACK_CACHE, aio_comp, offset,
-    length, discard_granularity_bytes,
-    image_ctx->get_data_io_context(), trace);
+    *image_ctx, io::IMAGE_DISPATCH_LAYER_WRITEBACK_CACHE, aio_comp,
+    {{offset, length}}, io::ImageArea::DATA, discard_granularity_bytes, trace);
   req->send();
 }
 
@@ -113,8 +111,8 @@ void ImageWriteback<I>::aio_writesame(uint64_t offset, uint64_t length,
       on_finish, image_ctx, io::AIO_TYPE_WRITESAME);
   ZTracer::Trace trace;
   auto req = io::ImageDispatchSpec::create_write_same(
-    *image_ctx, io::IMAGE_DISPATCH_LAYER_WRITEBACK_CACHE, aio_comp, offset,
-    length, std::move(bl), image_ctx->get_data_io_context(),
+    *image_ctx, io::IMAGE_DISPATCH_LAYER_WRITEBACK_CACHE, aio_comp,
+    {{offset, length}}, io::ImageArea::DATA, std::move(bl),
     fadvise_flags, trace);
   req->send();
 }
@@ -136,9 +134,8 @@ void ImageWriteback<I>::aio_compare_and_write(Extents &&image_extents,
   ZTracer::Trace trace;
   auto req = io::ImageDispatchSpec::create_compare_and_write(
     *image_ctx, io::IMAGE_DISPATCH_LAYER_WRITEBACK_CACHE, aio_comp,
-    std::move(image_extents), std::move(cmp_bl), std::move(bl),
-    mismatch_offset, image_ctx->get_data_io_context(),
-    fadvise_flags, trace);
+    std::move(image_extents), io::ImageArea::DATA, std::move(cmp_bl),
+    std::move(bl), mismatch_offset, fadvise_flags, trace);
   req->send();
 }