From 282fa6dafc7539ba6d93e1cc9d8d8829d1d47615 Mon Sep 17 00:00:00 2001 From: Peter Krull Date: Sat, 1 Feb 2025 01:15:52 +0100 Subject: [PATCH] fix(maitake-sync): for cs-mutex, enter cs before locking mutex --- maitake-sync/src/blocking/default_mutex.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maitake-sync/src/blocking/default_mutex.rs b/maitake-sync/src/blocking/default_mutex.rs index deac18aa..0aebbb15 100644 --- a/maitake-sync/src/blocking/default_mutex.rs +++ b/maitake-sync/src/blocking/default_mutex.rs @@ -309,13 +309,13 @@ mod cs_impl { #[track_caller] #[inline(always)] fn with_lock(&self, f: impl FnOnce() -> R) -> R { - self.0.with_lock(|| critical_section::with(|_cs| f())) + critical_section::with(|_cs| self.0.with_lock(f)) } #[track_caller] #[inline(always)] fn try_with_lock(&self, f: impl FnOnce() -> R) -> Option { - self.0.try_with_lock(|| critical_section::with(|_cs| f())) + critical_section::with(|_cs| self.0.try_with_lock(f)) } #[inline]