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

Return a non-NULL owner only if the lock is exclusively held in owner_sx().

Browse Source 
Fix some whitespace bugs while here.

MFC after:	2 weeks
This commit is contained in:
Mark Johnston 2016-12-10 02:56:44 +00:00
parent 3ca2845d13
commit c365a2934e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_sx.c
View File

@ -215,12 +215,14 @@ unlock_sx(struct lock_object *lock)
int
owner_sx(const struct lock_object *lock, struct thread **owner)
{
const struct sx *sx = (const struct sx *)lock;
uintptr_t x = sx->sx_lock;
const struct sx *sx;
uintptr_t x;
*owner = (struct thread *)SX_OWNER(x);
return ((x & SX_LOCK_SHARED) != 0 ? (SX_SHARERS(x) != 0) :
(*owner != NULL));
sx = (const struct sx *)lock;
x = sx->sx_lock;
*owner = NULL;
return ((x & SX_LOCK_SHARED) != 0 ? (SX_SHARERS(x) != 0) :
((*owner = (struct thread *)SX_OWNER(x)) != NULL));
}
#endif