d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rwlock: tidy up __rw_runlock_hard similarly to r325921

Browse Source
This commit is contained in:
Mateusz Guzik 2017-12-31 00:31:14 +00:00
parent 74e0613ead
commit 80c39f6c37
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=327393
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_rwlock.c
View File

@ -755,7 +755,7 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td, uintptr_t v
LOCK_FILE_LINE_ARG_DEF)
{
struct turnstile *ts;
uintptr_t x, queue;
uintptr_t setv, queue;
if (SCHEDULER_STOPPED())
return;
@ -795,14 +795,14 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td, uintptr_t v
* acquired a read lock, so drop the turnstile lock and
* restart.
*/
x = RW_UNLOCKED;
setv = RW_UNLOCKED;
queue = TS_SHARED_QUEUE;
if (v & RW_LOCK_WRITE_WAITERS) {
queue = TS_EXCLUSIVE_QUEUE;
x |= (v & RW_LOCK_READ_WAITERS);
} else
queue = TS_SHARED_QUEUE;
setv |= (v & RW_LOCK_READ_WAITERS);
}
v |= RW_READERS_LOCK(1);
if (!atomic_fcmpset_rel_ptr(&rw->rw_lock, &v, x))
if (!atomic_fcmpset_rel_ptr(&rw->rw_lock, &v, setv))
goto retry_ts;
if (LOCK_LOG_TEST(&rw->lock_object, 0))
CTR2(KTR_LOCK, "%s: %p last succeeded with waiters",