From 13a5c7f91f356541faaec72888533fc7a156c3da Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 10 Sep 2024 18:12:20 -0400 Subject: [PATCH] kernel/lock: Remove ASSERT_UNLOCKED_RW_LOCK from _rw_lock_read_lock. It's valid to read-lock the same rwlock twice, of course. (Only affects KDEBUG_RW_LOCK_DEBUG builds, the assertions do nothing on any other.) --- src/system/kernel/locks/lock.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/system/kernel/locks/lock.cpp b/src/system/kernel/locks/lock.cpp index b501f567d3..5a910d2b98 100644 --- a/src/system/kernel/locks/lock.cpp +++ b/src/system/kernel/locks/lock.cpp @@ -512,7 +512,6 @@ _rw_lock_read_lock(rw_lock* lock) #if KDEBUG_RW_LOCK_DEBUG int32 oldCount = atomic_add(&lock->count, 1); if (oldCount < RW_LOCK_WRITER_COUNT_BASE) { - ASSERT_UNLOCKED_RW_LOCK(lock); _rw_lock_set_read_locked(lock); return B_OK; } @@ -526,8 +525,6 @@ _rw_lock_read_lock(rw_lock* lock) return B_OK; } - ASSERT_UNLOCKED_RW_LOCK(lock); - // The writer that originally had the lock when we called atomic_add() might // already have gone and another writer could have overtaken us. In this // case the original writer set pending_readers, so we know that we don't