From 7ca0163aab9626deefb55a1cf59721d7c574f5ea Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Thu, 21 Mar 2024 09:43:34 +0800 Subject: [PATCH] crimson/common/tri_mutex: drop the unused greedy param Signed-off-by: Yingxin Cheng (cherry picked from commit 9cdb67fa19ea7d912a5f3e7a14092a205dee80ac) --- src/crimson/common/tri_mutex.cc | 10 +++++----- src/crimson/common/tri_mutex.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/crimson/common/tri_mutex.cc b/src/crimson/common/tri_mutex.cc index e4b18128053e3..633be55f98c18 100644 --- a/src/crimson/common/tri_mutex.cc +++ b/src/crimson/common/tri_mutex.cc @@ -15,7 +15,7 @@ void read_lock::unlock() seastar::future<> write_lock::lock() { - return static_cast(this)->lock_for_write(false); + return static_cast(this)->lock_for_write(); } void write_lock::unlock() @@ -110,19 +110,19 @@ void tri_mutex::demote_to_read() ++readers; } -seastar::future<> tri_mutex::lock_for_write(bool greedy) +seastar::future<> tri_mutex::lock_for_write() { - if (try_lock_for_write(greedy)) { + if (try_lock_for_write()) { return seastar::make_ready_future<>(); } waiters.emplace_back(seastar::promise<>(), type_t::write); return waiters.back().pr.get_future(); } -bool tri_mutex::try_lock_for_write(bool greedy) noexcept +bool tri_mutex::try_lock_for_write() noexcept { if (!readers && !exclusively_used) { - if (greedy || waiters.empty()) { + if (waiters.empty()) { ++writers; return true; } diff --git a/src/crimson/common/tri_mutex.h b/src/crimson/common/tri_mutex.h index 0533f3539d970..369a8802cf067 100644 --- a/src/crimson/common/tri_mutex.h +++ b/src/crimson/common/tri_mutex.h @@ -99,8 +99,8 @@ public: } // for shared writers - seastar::future<> lock_for_write(bool greedy); - bool try_lock_for_write(bool greedy) noexcept; + seastar::future<> lock_for_write(); + bool try_lock_for_write() noexcept; void unlock_for_write(); void promote_from_write(); void demote_to_write(); -- 2.39.5