From 9f8bf473cef7a4a87c34d7773e89e9238f2a7fd2 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Mon, 3 Jun 2024 14:31:35 +0800 Subject: [PATCH] crimson/common/tri_mutex: minor cleanup to be consistent Signed-off-by: Yingxin Cheng Signed-off-by: Matan Breizman (cherry picked from commit 251b9d4bca14c314b467fd77202e76a70ed90c0f) --- src/crimson/common/tri_mutex.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/crimson/common/tri_mutex.cc b/src/crimson/common/tri_mutex.cc index 698b9b43e174b..9576f8df6bca7 100644 --- a/src/crimson/common/tri_mutex.cc +++ b/src/crimson/common/tri_mutex.cc @@ -85,9 +85,8 @@ bool tri_mutex::try_lock_for_read() noexcept if (!writers && !exclusively_used && waiters.empty()) { ++readers; return true; - } else { - return false; } + return false; } void tri_mutex::unlock_for_read() @@ -135,11 +134,9 @@ bool tri_mutex::try_lock_for_write() noexcept { LOG_PREFIX(tri_mutex::try_lock_for_write()); DEBUGDPP("", *this); - if (!readers && !exclusively_used) { - if (waiters.empty()) { - ++writers; - return true; - } + if (!readers && !exclusively_used && waiters.empty()) { + ++writers; + return true; } return false; } -- 2.39.5