summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_mutex.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2006-06-03 20:45:00 +0000
committerjhb <jhb@FreeBSD.org>2006-06-03 20:45:00 +0000
commit9c15984c1bbf14716670b818e9aa27a5fc47ce03 (patch)
tree9d1bb9b6da7bcfb8e9badcbb89de5e5e8d658a62 /sys/kern/kern_mutex.c
parent4f9dae34b792b8e0e7862e2ac3fef12ff2c0668a (diff)
downloadFreeBSD-src-9c15984c1bbf14716670b818e9aa27a5fc47ce03.zip
FreeBSD-src-9c15984c1bbf14716670b818e9aa27a5fc47ce03.tar.gz
Simplify mtx_owner() so it only reads m->mtx_lock once.
Diffstat (limited to 'sys/kern/kern_mutex.c')
-rw-r--r--sys/kern/kern_mutex.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 6c5b2a3..65b8300 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -85,8 +85,7 @@ __FBSDID("$FreeBSD$");
*/
#define mtx_unowned(m) ((m)->mtx_lock == MTX_UNOWNED)
-#define mtx_owner(m) (mtx_unowned((m)) ? NULL \
- : (struct thread *)((m)->mtx_lock & MTX_FLAGMASK))
+#define mtx_owner(m) ((struct thread *)((m)->mtx_lock & (MTX_FLAGMASK|MTX_UNOWNED)))
#ifdef DDB
static void db_show_mtx(struct lock_object *lock);
OpenPOWER on IntegriCloud