Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use sel{record,remove}_knote().

Browse Source
This commit is contained in:
thorpej 2021-01-04 15:29:34 +00:00
parent c52d7a8efb
commit 10ec075e09
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/sandpoint/sandpoint/satmgr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: satmgr.c,v 1.28 2018/09/03 16:29:27 riastradh Exp $ */ /* $NetBSD: satmgr.c,v 1.29 2021/01/04 15:36:22 thorpej Exp $ */
/*- /*-
* Copyright (c) 2010 The NetBSD Foundation, Inc. * Copyright (c) 2010 The NetBSD Foundation, Inc.
@ -589,7 +589,7 @@ filt_rdetach(struct knote *kn)
struct satmgr_softc *sc = kn->kn_hook; struct satmgr_softc *sc = kn->kn_hook;
mutex_enter(&sc->sc_lock); mutex_enter(&sc->sc_lock);
SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext); selremove_knote(&sc->sc_rsel, kn);
mutex_exit(&sc->sc_lock); mutex_exit(&sc->sc_lock);
} }
@ -613,11 +613,9 @@ static int
satkqfilter(dev_t dev, struct knote *kn) satkqfilter(dev_t dev, struct knote *kn)
{ {
struct satmgr_softc *sc = device_lookup_private(&satmgr_cd, 0); struct satmgr_softc *sc = device_lookup_private(&satmgr_cd, 0);
struct klist *klist;
switch (kn->kn_filter) { switch (kn->kn_filter) {
case EVFILT_READ: case EVFILT_READ:
klist = &sc->sc_rsel.sel_klist;
kn->kn_fop = &read_filtops; kn->kn_fop = &read_filtops;
break; break;
@ -628,7 +626,7 @@ satkqfilter(dev_t dev, struct knote *kn)
kn->kn_hook = sc; kn->kn_hook = sc;
mutex_enter(&sc->sc_lock); mutex_enter(&sc->sc_lock);
SLIST_INSERT_HEAD(klist, kn, kn_selnext); selrecord_knote(&sc->sc_rsel, kn);
mutex_exit(&sc->sc_lock); mutex_exit(&sc->sc_lock);
return 0; return 0;

10
sys/arch/sparc/dev/tctrl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tctrl.c,v 1.62 2020/06/13 05:31:28 jdc Exp $ */ /* $NetBSD: tctrl.c,v 1.63 2021/01/04 15:29:34 thorpej Exp $ */
/*- /*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc. * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.62 2020/06/13 05:31:28 jdc Exp $"); __KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.63 2021/01/04 15:29:34 thorpej Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1218,7 +1218,7 @@ filt_tctrlrdetach(struct knote *kn)
int s; int s;
s = splts102(); s = splts102();
SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext); selremove_knote(&sc->sc_rsel, kn);
splx(s); splx(s);
} }
@ -1243,12 +1243,10 @@ tctrlkqfilter(dev_t dev, struct knote *kn)
{ {
struct tctrl_softc *sc = device_lookup_private(&tctrl_cd, struct tctrl_softc *sc = device_lookup_private(&tctrl_cd,
TCTRL_STD_DEV); TCTRL_STD_DEV);
struct klist *klist;
int s; int s;
switch (kn->kn_filter) { switch (kn->kn_filter) {
case EVFILT_READ: case EVFILT_READ:
klist = &sc->sc_rsel.sel_klist;
kn->kn_fop = &tctrlread_filtops; kn->kn_fop = &tctrlread_filtops;
break; break;
@ -1259,7 +1257,7 @@ tctrlkqfilter(dev_t dev, struct knote *kn)
kn->kn_hook = sc; kn->kn_hook = sc;
s = splts102(); s = splts102();
SLIST_INSERT_HEAD(klist, kn, kn_selnext); selrecord_knote(&sc->sc_rsel, kn);
splx(s); splx(s);
return (0); return (0);