Module Name: src
Committed By: thorpej
Date: Fri Dec 18 01:40:20 UTC 2020
Modified Files:
src/sys/dev/usb: udsir.c ugen.c uhid.c uirda.c usb.c uscanner.c ustir.c
Log Message:
Use sel{record,remove}_knote().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.187 -r1.188 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/usb/ustir.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/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.11 src/sys/dev/usb/udsir.c:1.12
--- src/sys/dev/usb/udsir.c:1.11 Sat Mar 14 02:35:33 2020
+++ src/sys/dev/usb/udsir.c Fri Dec 18 01:40:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.11 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: udsir.c,v 1.12 2020/12/18 01:40:20 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.11 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.12 2020/12/18 01:40:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -680,16 +680,16 @@ static int
udsir_kqfilter(void *h, struct knote *kn)
{
struct udsir_softc *sc = h;
- struct klist *klist;
+ struct selinfo *sip;
int s;
switch (kn->kn_filter) {
case EVFILT_READ:
- klist = &sc->sc_rd_sel.sel_klist;
+ sip = &sc->sc_rd_sel;
kn->kn_fop = &udsirread_filtops;
break;
case EVFILT_WRITE:
- klist = &sc->sc_wr_sel.sel_klist;
+ sip = &sc->sc_wr_sel;
kn->kn_fop = &udsirwrite_filtops;
break;
default:
@@ -699,7 +699,7 @@ udsir_kqfilter(void *h, struct knote *kn
kn->kn_hook = sc;
s = splusb();
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+ selrecord_knote(sip, kn);
splx(s);
return 0;
@@ -772,7 +772,7 @@ filt_udsirrdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sc->sc_rd_sel.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sc->sc_rd_sel, kn);
splx(s);
}
@@ -793,7 +793,7 @@ filt_udsirwdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sc->sc_wr_sel.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sc->sc_wr_sel, kn);
splx(s);
}
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.157 src/sys/dev/usb/ugen.c:1.158
--- src/sys/dev/usb/ugen.c:1.157 Tue Aug 18 14:32:34 2020
+++ src/sys/dev/usb/ugen.c Fri Dec 18 01:40:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.157 2020/08/18 14:32:34 riastradh Exp $ */
+/* $NetBSD: ugen.c,v 1.158 2020/12/18 01:40:20 thorpej Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.157 2020/08/18 14:32:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.158 2020/12/18 01:40:20 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2031,7 +2031,7 @@ filt_ugenrdetach(struct knote *kn)
struct ugen_softc *sc = sce->sc;
mutex_enter(&sc->sc_lock);
- SLIST_REMOVE(&sce->rsel.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sce->rsel, kn);
mutex_exit(&sc->sc_lock);
}
@@ -2168,7 +2168,7 @@ ugenkqfilter(dev_t dev, struct knote *kn
{
struct ugen_softc *sc;
struct ugen_endpoint *sce;
- struct klist *klist;
+ struct selinfo *sip;
int error;
if ((sc = ugenif_acquire(UGENUNIT(dev))) == NULL)
@@ -2187,7 +2187,7 @@ ugenkqfilter(dev_t dev, struct knote *kn
goto out;
}
- klist = &sce->rsel.sel_klist;
+ sip = &sce->rsel;
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_INTERRUPT:
kn->kn_fop = &ugenread_intr_filtops;
@@ -2211,7 +2211,7 @@ ugenkqfilter(dev_t dev, struct knote *kn
goto out;
}
- klist = &sce->rsel.sel_klist;
+ sip = &sce->rsel;
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_INTERRUPT:
case UE_ISOCHRONOUS:
@@ -2236,7 +2236,7 @@ ugenkqfilter(dev_t dev, struct knote *kn
kn->kn_hook = sce;
mutex_enter(&sc->sc_lock);
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+ selrecord_knote(sip, kn);
mutex_exit(&sc->sc_lock);
error = 0;
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.116 src/sys/dev/usb/uhid.c:1.117
--- src/sys/dev/usb/uhid.c:1.116 Mon Nov 30 00:48:35 2020
+++ src/sys/dev/usb/uhid.c Fri Dec 18 01:40:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.116 2020/11/30 00:48:35 riastradh Exp $ */
+/* $NetBSD: uhid.c,v 1.117 2020/12/18 01:40:20 thorpej Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.116 2020/11/30 00:48:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.117 2020/12/18 01:40:20 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -831,7 +831,7 @@ filt_uhidrdetach(struct knote *kn)
struct uhid_softc *sc = kn->kn_hook;
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);
}
@@ -873,7 +873,6 @@ static int
uhidkqfilter(dev_t dev, struct knote *kn)
{
struct uhid_softc *sc;
- struct klist *klist;
int error;
error = uhid_enter(dev, &sc);
@@ -882,11 +881,9 @@ uhidkqfilter(dev_t dev, struct knote *kn
switch (kn->kn_filter) {
case EVFILT_READ:
- klist = &sc->sc_rsel.sel_klist;
kn->kn_fop = &uhidread_filtops;
break;
case EVFILT_WRITE:
- klist = &sc->sc_rsel.sel_klist;
kn->kn_fop = &uhid_seltrue_filtops;
break;
default:
@@ -897,7 +894,7 @@ uhidkqfilter(dev_t dev, struct knote *kn
kn->kn_hook = sc;
mutex_enter(&sc->sc_lock);
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+ selrecord_knote(&sc->sc_rsel, kn);
mutex_exit(&sc->sc_lock);
out: uhid_exit(sc);
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.47 src/sys/dev/usb/uirda.c:1.48
--- src/sys/dev/usb/uirda.c:1.47 Sat Mar 14 02:35:33 2020
+++ src/sys/dev/usb/uirda.c Fri Dec 18 01:40:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.47 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: uirda.c,v 1.48 2020/12/18 01:40:20 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.47 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.48 2020/12/18 01:40:20 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -616,7 +616,7 @@ filt_uirdardetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sc->sc_rd_sel.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sc->sc_rd_sel, kn);
splx(s);
}
@@ -636,7 +636,7 @@ filt_uirdawdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sc->sc_wr_sel.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sc->sc_wr_sel, kn);
splx(s);
}
@@ -658,16 +658,16 @@ int
uirda_kqfilter(void *h, struct knote *kn)
{
struct uirda_softc *sc = kn->kn_hook;
- struct klist *klist;
+ struct selinfo *sip;
int s;
switch (kn->kn_filter) {
case EVFILT_READ:
- klist = &sc->sc_rd_sel.sel_klist;
+ sip = &sc->sc_rd_sel;
kn->kn_fop = &uirdaread_filtops;
break;
case EVFILT_WRITE:
- klist = &sc->sc_wr_sel.sel_klist;
+ sip = &sc->sc_wr_sel;
kn->kn_fop = &uirdawrite_filtops;
break;
default:
@@ -677,7 +677,7 @@ uirda_kqfilter(void *h, struct knote *kn
kn->kn_hook = sc;
s = splusb();
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+ selrecord_knote(sip, kn);
splx(s);
return 0;
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.187 src/sys/dev/usb/usb.c:1.188
--- src/sys/dev/usb/usb.c:1.187 Wed May 27 07:17:45 2020
+++ src/sys/dev/usb/usb.c Fri Dec 18 01:40:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.187 2020/05/27 07:17:45 skrll Exp $ */
+/* $NetBSD: usb.c,v 1.188 2020/12/18 01:40:20 thorpej Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.187 2020/05/27 07:17:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.188 2020/12/18 01:40:20 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1022,7 +1022,7 @@ filt_usbrdetach(struct knote *kn)
{
mutex_enter(&usb_event_lock);
- SLIST_REMOVE(&usb_selevent.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&usb_selevent, kn);
mutex_exit(&usb_event_lock);
}
@@ -1047,13 +1047,11 @@ static const struct filterops usbread_fi
int
usbkqfilter(dev_t dev, struct knote *kn)
{
- struct klist *klist;
switch (kn->kn_filter) {
case EVFILT_READ:
if (minor(dev) != USB_DEV_MINOR)
return 1;
- klist = &usb_selevent.sel_klist;
kn->kn_fop = &usbread_filtops;
break;
@@ -1064,7 +1062,7 @@ usbkqfilter(dev_t dev, struct knote *kn)
kn->kn_hook = NULL;
mutex_enter(&usb_event_lock);
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+ selrecord_knote(&usb_selevent, kn);
mutex_exit(&usb_event_lock);
return 0;
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.84 src/sys/dev/usb/uscanner.c:1.85
--- src/sys/dev/usb/uscanner.c:1.84 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/uscanner.c Fri Dec 18 01:40:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.84 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: uscanner.c,v 1.85 2020/12/18 01:40:20 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.84 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.85 2020/12/18 01:40:20 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -675,7 +675,7 @@ filt_uscannerdetach(struct knote *kn)
{
struct uscanner_softc *sc = kn->kn_hook;
- SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sc->sc_selq, kn);
}
static const struct filterops uscanner_seltrue_filtops = {
@@ -689,7 +689,7 @@ int
uscannerkqfilter(dev_t dev, struct knote *kn)
{
struct uscanner_softc *sc;
- struct klist *klist;
+ struct selinfo *sip;
sc = device_lookup_private(&uscanner_cd, USCANNERUNIT(dev));
@@ -704,7 +704,7 @@ uscannerkqfilter(dev_t dev, struct knote
* yield any data or a write will happen.
* Pretend they will.
*/
- klist = &sc->sc_selq.sel_klist;
+ sip = &sc->sc_selq;
kn->kn_fop = &uscanner_seltrue_filtops;
break;
@@ -714,7 +714,7 @@ uscannerkqfilter(dev_t dev, struct knote
kn->kn_hook = sc;
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+ selrecord_knote(sip, kn);
return 0;
}
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.46 src/sys/dev/usb/ustir.c:1.47
--- src/sys/dev/usb/ustir.c:1.46 Sat Mar 14 02:35:33 2020
+++ src/sys/dev/usb/ustir.c Fri Dec 18 01:40:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.46 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: ustir.c,v 1.47 2020/12/18 01:40:20 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.46 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.47 2020/12/18 01:40:20 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1059,7 +1059,7 @@ filt_ustirrdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sc->sc_rd_sel.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sc->sc_rd_sel, kn);
splx(s);
}
@@ -1080,7 +1080,7 @@ filt_ustirwdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sc->sc_wr_sel.sel_klist, kn, knote, kn_selnext);
+ selremove_knote(&sc->sc_wr_sel, kn);
splx(s);
}
@@ -1112,16 +1112,16 @@ Static int
ustir_kqfilter(void *h, struct knote *kn)
{
struct ustir_softc *sc = h;
- struct klist *klist;
+ struct selinfo *sip;
int s;
switch (kn->kn_filter) {
case EVFILT_READ:
- klist = &sc->sc_rd_sel.sel_klist;
+ sip = &sc->sc_rd_sel;
kn->kn_fop = &ustirread_filtops;
break;
case EVFILT_WRITE:
- klist = &sc->sc_wr_sel.sel_klist;
+ sip = &sc->sc_wr_sel;
kn->kn_fop = &ustirwrite_filtops;
break;
default:
@@ -1131,7 +1131,7 @@ ustir_kqfilter(void *h, struct knote *kn
kn->kn_hook = sc;
s = splusb();
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+ selrecord_knote(sip, kn);
splx(s);
return 0;
