summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_synch.c
diff options
context:
space:
mode:
authordavide <davide@FreeBSD.org>2013-09-20 23:06:21 +0000
committerdavide <davide@FreeBSD.org>2013-09-20 23:06:21 +0000
commit5273d359fdd82fc7a93ff0f694844d25a2e17c59 (patch)
tree0f8acc1728a85e0911253a1fa7cfe9c10d2c05b4 /sys/kern/kern_synch.c
parent7ed30adae7eb0c6e156983ca0c96c04e1e6a8e0d (diff)
downloadFreeBSD-src-5273d359fdd82fc7a93ff0f694844d25a2e17c59.zip
FreeBSD-src-5273d359fdd82fc7a93ff0f694844d25a2e17c59.tar.gz
Fix lc_lock/lc_unlock() support for rmlocks held in shared mode. With
current lock classes KPI it was really difficult because there was no way to pass an rmtracker object to the lock/unlock routines. In order to accomplish the task, modify the aforementioned functions so that they can return (or pass as argument) an uinptr_t, which is in the rm case used to hold a pointer to struct rm_priotracker for current thread. As an added bonus, this fixes rm_sleep() in the rm shared case, which right now can communicate priotracker structure between lc_unlock()/lc_lock(). Suggested by: jhb Reviewed by: jhb Approved by: re (delphij)
Diffstat (limited to 'sys/kern/kern_synch.c')
-rw-r--r--sys/kern/kern_synch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index b0e1908..0a400e9 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -157,7 +157,8 @@ _sleep(void *ident, struct lock_object *lock, int priority,
struct thread *td;
struct proc *p;
struct lock_class *class;
- int catch, lock_state, pri, rval, sleepq_flags;
+ uintptr_t lock_state;
+ int catch, pri, rval, sleepq_flags;
WITNESS_SAVE_DECL(lock_witness);
td = curthread;
OpenPOWER on IntegriCloud