From a0ccd8bb3ffbecb3313c0cdd7d3e6091fc2a9721 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Thu, 9 Nov 2023 09:43:20 -0700 Subject: [PATCH] librbd: Eliminate unused m_synchronous from AbstractImageWriteRequest This has been unused since its introduction years ago and so isn't worth keeping. Signed-off-by: Joshua Baergen --- src/librbd/io/ImageRequest.cc | 19 +++++++++---------- src/librbd/io/ImageRequest.h | 21 ++++++--------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/librbd/io/ImageRequest.cc b/src/librbd/io/ImageRequest.cc index e4c41c22976a7..95bac7b245cb3 100644 --- a/src/librbd/io/ImageRequest.cc +++ b/src/librbd/io/ImageRequest.cc @@ -473,7 +473,7 @@ void AbstractImageWriteRequest::send_request() { if (journaling) { // in-flight ops are flushed prior to closing the journal ceph_assert(image_ctx.journal != NULL); - journal_tid = append_journal_event(m_synchronous); + journal_tid = append_journal_event(); } // it's very important that IOContext is captured here instead of @@ -518,7 +518,7 @@ void ImageWriteRequest::assemble_extent( } template -uint64_t ImageWriteRequest::append_journal_event(bool synchronous) { +uint64_t ImageWriteRequest::append_journal_event() { I &image_ctx = this->m_image_ctx; uint64_t tid = 0; @@ -530,7 +530,7 @@ uint64_t ImageWriteRequest::append_journal_event(bool synchronous) { buffer_offset += extent.second; tid = image_ctx.journal->append_write_event(extent.first, extent.second, - sub_bl, synchronous); + sub_bl, false); } return tid; @@ -566,7 +566,7 @@ void ImageWriteRequest::update_stats(size_t length) { } template -uint64_t ImageDiscardRequest::append_journal_event(bool synchronous) { +uint64_t ImageDiscardRequest::append_journal_event() { I &image_ctx = this->m_image_ctx; uint64_t tid = 0; @@ -578,7 +578,7 @@ uint64_t ImageDiscardRequest::append_journal_event(bool synchronous) { this->m_discard_granularity_bytes)); tid = image_ctx.journal->append_io_event(std::move(event_entry), extent.first, extent.second, - synchronous, 0); + false, 0); } return tid; @@ -717,7 +717,7 @@ void ImageFlushRequest::send_request() { } template -uint64_t ImageWriteSameRequest::append_journal_event(bool synchronous) { +uint64_t ImageWriteSameRequest::append_journal_event() { I &image_ctx = this->m_image_ctx; uint64_t tid = 0; @@ -728,7 +728,7 @@ uint64_t ImageWriteSameRequest::append_journal_event(bool synchronous) { m_data_bl)); tid = image_ctx.journal->append_io_event(std::move(event_entry), extent.first, extent.second, - synchronous, 0); + false, 0); } return tid; @@ -768,8 +768,7 @@ void ImageWriteSameRequest::update_stats(size_t length) { } template -uint64_t ImageCompareAndWriteRequest::append_journal_event( - bool synchronous) { +uint64_t ImageCompareAndWriteRequest::append_journal_event() { I &image_ctx = this->m_image_ctx; uint64_t tid = 0; @@ -779,7 +778,7 @@ uint64_t ImageCompareAndWriteRequest::append_journal_event( extent.second, m_cmp_bl, m_bl, - synchronous); + false); return tid; } diff --git a/src/librbd/io/ImageRequest.h b/src/librbd/io/ImageRequest.h index 2668c1acb2cda..996c90a11f218 100644 --- a/src/librbd/io/ImageRequest.h +++ b/src/librbd/io/ImageRequest.h @@ -114,11 +114,6 @@ private: template class AbstractImageWriteRequest : public ImageRequest { -public: - inline void flag_synchronous() { - m_synchronous = true; - } - protected: using typename ImageRequest::ObjectRequests; @@ -127,8 +122,7 @@ protected: const char *trace_name, const ZTracer::Trace &parent_trace) : ImageRequest(image_ctx, aio_comp, std::move(image_extents), - area, trace_name, parent_trace), - m_synchronous(false) { + area, trace_name, parent_trace) { } void send_request() override; @@ -144,11 +138,8 @@ protected: const LightweightObjectExtent &object_extent, IOContext io_context, uint64_t journal_tid, bool single_extent, Context *on_finish) = 0; - virtual uint64_t append_journal_event(bool synchronous) = 0; + virtual uint64_t append_journal_event() = 0; virtual void update_stats(size_t length) = 0; - -private: - bool m_synchronous; }; template @@ -180,7 +171,7 @@ protected: const LightweightObjectExtent &object_extent, IOContext io_context, uint64_t journal_tid, bool single_extent, Context *on_finish) override; - uint64_t append_journal_event(bool synchronous) override; + uint64_t append_journal_event() override; void update_stats(size_t length) override; private: @@ -215,7 +206,7 @@ protected: const LightweightObjectExtent &object_extent, IOContext io_context, uint64_t journal_tid, bool single_extent, Context *on_finish) override; - uint64_t append_journal_event(bool synchronous) override; + uint64_t append_journal_event() override; void update_stats(size_t length) override; int prune_object_extents( @@ -283,7 +274,7 @@ protected: const LightweightObjectExtent &object_extent, IOContext io_context, uint64_t journal_tid, bool single_extent, Context *on_finish) override; - uint64_t append_journal_event(bool synchronous) override; + uint64_t append_journal_event() override; void update_stats(size_t length) override; private: bufferlist m_data_bl; @@ -315,7 +306,7 @@ protected: const LightweightObjectExtent &object_extent, IOContext io_context, uint64_t journal_tid, bool single_extent, Context *on_finish) override; - uint64_t append_journal_event(bool synchronous) override; + uint64_t append_journal_event() override; void update_stats(size_t length) override; aio_type_t get_aio_type() const override { -- 2.39.5