CVS commit: src/sys

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Sat Dec 19 22:09:15 UTC 2020

Modified Files:
        src/sys/external/bsd/drm2/drm: drm_cdevsw.c
        src/sys/miscfs/fifofs: fifo_vnops.c

Log Message:
Use sel{record,remove}_knote().


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drm_cdevsw.c
cvs rdiff -u -r1.81 -r1.82 src/sys/miscfs/fifofs/fifo_vnops.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/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.14 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.15
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.14	Tue Apr 16 10:00:04 2019
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c	Sat Dec 19 22:09:15 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_cdevsw.c,v 1.14 2019/04/16 10:00:04 mrg Exp $	*/
+/*	$NetBSD: drm_cdevsw.c,v 1.15 2020/12/19 22:09:15 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.14 2019/04/16 10:00:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.15 2020/12/19 22:09:15 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -404,7 +404,7 @@ drm_kqfilter(struct file *fp, struct kno
 		kn->kn_fop = &drm_filtops;
 		kn->kn_hook = file;
 		spin_lock_irqsave(&dev->event_lock, irqflags);
-		SLIST_INSERT_HEAD(&file->event_selq.sel_klist, kn, kn_selnext);
+		selrecord_knote(&file->event_selq, kn);
 		spin_unlock_irqrestore(&dev->event_lock, irqflags);
 		return 0;
 	case EVFILT_WRITE:
@@ -421,7 +421,7 @@ filt_drm_detach(struct knote *kn)
 	unsigned long irqflags;
 
 	spin_lock_irqsave(&dev->event_lock, irqflags);
-	SLIST_REMOVE(&file->event_selq.sel_klist, kn, knote, kn_selnext);
+	selremove_knote(&file->event_selq, kn);
 	spin_unlock_irqrestore(&dev->event_lock, irqflags);
 }
 

Index: src/sys/miscfs/fifofs/fifo_vnops.c
diff -u src/sys/miscfs/fifofs/fifo_vnops.c:1.81 src/sys/miscfs/fifofs/fifo_vnops.c:1.82
--- src/sys/miscfs/fifofs/fifo_vnops.c:1.81	Sat Jun 27 17:29:19 2020
+++ src/sys/miscfs/fifofs/fifo_vnops.c	Sat Dec 19 22:09:15 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: fifo_vnops.c,v 1.81 2020/06/27 17:29:19 christos Exp $	*/
+/*	$NetBSD: fifo_vnops.c,v 1.82 2020/12/19 22:09:15 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.81 2020/06/27 17:29:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.82 2020/12/19 22:09:15 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -516,9 +516,9 @@ filt_fifordetach(struct knote *kn)
 
 	so = (struct socket *)kn->kn_hook;
 	solock(so);
-	SLIST_REMOVE(&so->so_rcv.sb_sel.sel_klist, kn, knote, kn_selnext);
-	if (SLIST_EMPTY(&so->so_rcv.sb_sel.sel_klist))
-		so->so_rcv.sb_flags &= ~SB_KNOTE;
+	selremove_knote(&so->so_rcv.sb_sel, kn);
+	if (SLIST_EMPTY(&so->so_rcv.sb_sel.sel_klist))	/* XXX select/kqueue */
+		so->so_rcv.sb_flags &= ~SB_KNOTE;	/* XXX internals */
 	sounlock(so);
 }
 
@@ -551,9 +551,9 @@ filt_fifowdetach(struct knote *kn)
 
 	so = (struct socket *)kn->kn_hook;
 	solock(so);
-	SLIST_REMOVE(&so->so_snd.sb_sel.sel_klist, kn, knote, kn_selnext);
-	if (SLIST_EMPTY(&so->so_snd.sb_sel.sel_klist))
-		so->so_snd.sb_flags &= ~SB_KNOTE;
+	selremove_knote(&so->so_snd.sb_sel, kn);
+	if (SLIST_EMPTY(&so->so_snd.sb_sel.sel_klist))	/* XXX select/kqueue */
+		so->so_snd.sb_flags &= ~SB_KNOTE;	/* XXX internals */
 	sounlock(so);
 }
 
@@ -621,7 +621,7 @@ fifo_kqfilter(void *v)
 	ap->a_kn->kn_hook = so;
 
 	solock(so);
-	SLIST_INSERT_HEAD(&sb->sb_sel.sel_klist, ap->a_kn, kn_selnext);
+	selrecord_knote(&sb->sb_sel, ap->a_kn);
 	sb->sb_flags |= SB_KNOTE;
 	sounlock(so);