summaryrefslogtreecommitdiffstats
path: root/sys/net/bpf.c
diff options
context:
space:
mode:
authorssouhlal <ssouhlal@FreeBSD.org>2005-07-01 16:28:32 +0000
committerssouhlal <ssouhlal@FreeBSD.org>2005-07-01 16:28:32 +0000
commitefe31cd3da51660534ea5ec76bd1566fe89689d2 (patch)
treec6d52b2fecc4fcf947f2ca3718ee85b3a7aaeff0 /sys/net/bpf.c
parent02c2d90f46ccecd39658689921e212d8dd15f796 (diff)
downloadFreeBSD-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/net/bpf.c')
-rw-r--r--sys/net/bpf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 514d6d2..e917866 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -375,7 +375,7 @@ bpfopen(dev, flags, fmt, td)
#endif
mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF);
callout_init(&d->bd_callout, NET_CALLOUT_MPSAFE);
- knlist_init(&d->bd_sel.si_note, &d->bd_mtx);
+ knlist_init(&d->bd_sel.si_note, &d->bd_mtx, NULL, NULL, NULL);
return (0);
}
OpenPOWER on IntegriCloud