diff options
author | ssouhlal <ssouhlal@FreeBSD.org> | 2005-07-01 16:28:32 +0000 |
---|---|---|
committer | ssouhlal <ssouhlal@FreeBSD.org> | 2005-07-01 16:28:32 +0000 |
commit | efe31cd3da51660534ea5ec76bd1566fe89689d2 (patch) | |
tree | c6d52b2fecc4fcf947f2ca3718ee85b3a7aaeff0 /sys/kern/tty.c | |
parent | 02c2d90f46ccecd39658689921e212d8dd15f796 (diff) | |
download | FreeBSD-src-efe31cd3da51660534ea5ec76bd1566fe89689d2.zip FreeBSD-src-efe31cd3da51660534ea5ec76bd1566fe89689d2.tar.gz |
Fix the recent panics/LORs/hangs created by my kqueue commit by:
- Introducing the possibility of using locks different than mutexes
for the knlist locking. In order to do this, we add three arguments to
knlist_init() to specify the functions to use to lock, unlock and
check if the lock is owned. If these arguments are NULL, we assume
mtx_lock, mtx_unlock and mtx_owned, respectively.
- Using the vnode lock for the knlist locking, when doing kqueue operations
on a vnode. This way, we don't have to lock the vnode while holding a
mutex, in filt_vfsread.
Reviewed by: jmg
Approved by: re (scottl), scottl (mentor override)
Pointyhat to: ssouhlal
Will be happy: everyone
Diffstat (limited to 'sys/kern/tty.c')
-rw-r--r-- | sys/kern/tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 8a6585b..6263432 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2865,8 +2865,8 @@ ttymalloc(struct tty *tp) mtx_lock(&tty_list_mutex); TAILQ_INSERT_TAIL(&tty_list, tp, t_list); mtx_unlock(&tty_list_mutex); - knlist_init(&tp->t_rsel.si_note, &tp->t_mtx); - knlist_init(&tp->t_wsel.si_note, &tp->t_mtx); + knlist_init(&tp->t_rsel.si_note, &tp->t_mtx, NULL, NULL, NULL); + knlist_init(&tp->t_wsel.si_note, &tp->t_mtx, NULL, NULL, NULL); return (tp); } |