Module Name: src
Committed By: thorpej
Date: Thu Sep 30 01:12:06 UTC 2021
Modified Files:
src/sys/kern: kern_event.c
Log Message:
In knote(), don't call kn->kn_fop->f_event() directly; use filter_event()
to get the correct KERNEL_LOCK handling for the filter attached to that
specific note.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/kern/kern_event.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.126 src/sys/kern/kern_event.c:1.127
--- src/sys/kern/kern_event.c:1.126 Sun Sep 26 23:37:40 2021
+++ src/sys/kern/kern_event.c Thu Sep 30 01:12:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.126 2021/09/26 23:37:40 thorpej Exp $ */
+/* $NetBSD: kern_event.c,v 1.127 2021/09/30 01:12:06 thorpej Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.126 2021/09/26 23:37:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.127 2021/09/30 01:12:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1856,10 +1856,9 @@ knote(struct klist *list, long hint)
struct knote *kn, *tmpkn;
SLIST_FOREACH_SAFE(kn, list, kn_selnext, tmpkn) {
- KASSERT(kn->kn_fop != NULL);
- KASSERT(kn->kn_fop->f_event != NULL);
- if ((*kn->kn_fop->f_event)(kn, hint))
+ if (filter_event(kn, hint)) {
knote_activate(kn);
+ }
}
}
