update ceph source to reef 18.1.2

[ceph.git] / ceph / src / librbd / journal / Replay.cc

diff --git a/ceph/src/librbd/journal/Replay.cc b/ceph/src/librbd/journal/Replay.cc
index db73edb610947e6f77258a5ccdeeacb65892ed23..42acf5eb24137ab1e810bdb256b2df10ad939c58 100644 (file)
--- a/ceph/src/librbd/journal/Replay.cc
+++ b/ceph/src/librbd/journal/Replay.cc
@@ -356,8 +356,8 @@ void Replay<I>::handle_event(const journal::AioDiscardEvent &event,
   if (!clipped_io(event.offset, aio_comp)) {
     io::ImageRequest<I>::aio_discard(&m_image_ctx, aio_comp,
                                      {{event.offset, event.length}},
-                                     event.discard_granularity_bytes,
-                                     m_image_ctx.get_data_io_context(), {});
+                                     io::ImageArea::DATA,
+                                     event.discard_granularity_bytes, {});
   }
 
   if (flush_required) {
@@ -391,8 +391,8 @@ void Replay<I>::handle_event(const journal::AioWriteEvent &event,
   if (!clipped_io(event.offset, aio_comp)) {
     io::ImageRequest<I>::aio_write(&m_image_ctx, aio_comp,
                                    {{event.offset, event.length}},
-                                   std::move(data),
-                                   m_image_ctx.get_data_io_context(), 0, {});
+                                   io::ImageArea::DATA, std::move(data),
+                                   0, {});
   }
 
   if (flush_required) {
@@ -445,9 +445,8 @@ void Replay<I>::handle_event(const journal::AioWriteSameEvent &event,
   if (!clipped_io(event.offset, aio_comp)) {
     io::ImageRequest<I>::aio_writesame(&m_image_ctx, aio_comp,
                                        {{event.offset, event.length}},
-                                       std::move(data),
-                                       m_image_ctx.get_data_io_context(), 0,
-                                       {});
+                                       io::ImageArea::DATA, std::move(data),
+                                       0, {});
   }
 
   if (flush_required) {
@@ -479,11 +478,10 @@ void Replay<I>::handle_event(const journal::AioWriteSameEvent &event,
   if (!clipped_io(event.offset, aio_comp)) {
     io::ImageRequest<I>::aio_compare_and_write(&m_image_ctx, aio_comp,
                                                {{event.offset, event.length}},
+                                               io::ImageArea::DATA,
                                                std::move(cmp_data),
                                                std::move(write_data),
-                                               nullptr,
-                                               m_image_ctx.get_data_io_context(),
-                                               0, {});
+                                               nullptr, 0, {});
   }
 
   if (flush_required) {