From: Joshua Baergen Date: Thu, 9 Nov 2023 16:43:20 +0000 (-0700) Subject: librbd: Eliminate unused m_synchronous from AbstractImageWriteRequest X-Git-Tag: v16.2.15~60^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b700ce4badacacc5c9b68fad9f0bb858929c24ea;p=ceph.git 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 (cherry picked from commit a0ccd8bb3ffbecb3313c0cdd7d3e6091fc2a9721) --- diff --git a/src/librbd/io/ImageRequest.cc b/src/librbd/io/ImageRequest.cc index 31405057ce97..4b78bbbe1612 100644 --- a/src/librbd/io/ImageRequest.cc +++ b/src/librbd/io/ImageRequest.cc @@ -469,7 +469,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 @@ -514,7 +514,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; @@ -526,7 +526,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; @@ -562,7 +562,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; @@ -574,7 +574,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; @@ -713,7 +713,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; @@ -724,7 +724,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; @@ -764,8 +764,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; @@ -776,7 +775,7 @@ uint64_t ImageCompareAndWriteRequest::append_journal_event( m_bl)); tid = image_ctx.journal->append_io_event(std::move(event_entry), extent.first, extent.second, - synchronous, -EILSEQ); + false, -EILSEQ); return tid; } diff --git a/src/librbd/io/ImageRequest.h b/src/librbd/io/ImageRequest.h index 7d3f2339568b..bf0b9d72ff92 100644 --- a/src/librbd/io/ImageRequest.h +++ b/src/librbd/io/ImageRequest.h @@ -116,11 +116,6 @@ private: template class AbstractImageWriteRequest : public ImageRequest { -public: - inline void flag_synchronous() { - m_synchronous = true; - } - protected: using typename ImageRequest::ObjectRequests; using typename ImageRequest::Extents; @@ -130,8 +125,7 @@ protected: const char *trace_name, const ZTracer::Trace &parent_trace) : ImageRequest(image_ctx, aio_comp, std::move(image_extents), - trace_name, parent_trace), - m_synchronous(false) { + trace_name, parent_trace) { } void send_request() override; @@ -147,11 +141,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 @@ -185,7 +176,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: @@ -220,7 +211,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( @@ -287,7 +278,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; @@ -319,7 +310,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 {