 @@ -1,14 +1,14 @@
-/*	$NetBSD: pxa2x0_apm.c,v 1.7 2021/09/26 16:36:18 thorpej Exp $	*/
+/*	$NetBSD: pxa2x0_apm.c,v 1.8 2022/02/12 15:51:28 thorpej Exp $	*/
 /*	$OpenBSD: pxa2x0_apm.c,v 1.28 2007/03/29 18:42:38 uwe Exp $	*/
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
  * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
  * Copyright (c) 1995 John T. Kohl.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -591,27 +591,27 @@ apm_record_event(struct pxa2x0_apm_softc
 	apm_evindex++;
 	KNOTE(&sc->sc_note, APM_EVENT_COMPOSE(type, apm_evindex));
 	return (0);
+}
 void
 filt_apmrdetach(struct knote *kn)
+{
 	struct pxa2x0_apm_softc *sc =
 	    (struct pxa2x0_apm_softc *)kn->kn_hook;
-	SLIST_REMOVE(&sc->sc_note, kn, knote, kn_selnext);
+	klist_remove(&sc->sc_note, kn);
+}
 int
 filt_apmread(struct knote *kn, long hint)
+{
 	/* XXX weird kqueue_scan() semantics */
 	if (hint && !kn->kn_data)
 		kn->kn_data = (int)hint;
 	return (1);
+}
 int
 @@ -623,44 +623,45 @@ apmkqfilter(dev_t dev, struct knote *kn)
 	if (!apm_cd.cd_ndevs || APMUNIT(dev) != 0 ||
 	    !(sc = apm_cd.cd_devs[APMUNIT(dev)]))
 		return (ENXIO);
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		kn->kn_fop = &apmread_filtops;
 		break;
 	default:
 		return (EINVAL);
+	}
 	kn->kn_hook = (caddr_t)sc;
-	SLIST_INSERT_HEAD(&sc->sc_note, kn, kn_selnext);
+	klist_insert(&sc->sc_note, kn);
 	return (0);
+}
 void
 pxa2x0_apm_attach_sub(struct pxa2x0_apm_softc *sc)
+{
 	sc->sc_iot = &pxa2x0_bs_tag;
 	if (bus_space_map(sc->sc_iot, PXA2X0_POWMAN_BASE,
 		PXA2X0_POWMAN_SIZE, 0, &sc->sc_pm_ioh)) {
 		printf("pxa2x0_apm_attach_sub: failed to map POWMAN\n");
 		return;
+	}
 	lockinit(&sc->sc_lock, PWAIT, "apmlk", 0, 0);
 	klist_init(&sc->sc_note);
 	kthread_create_deferred(apm_thread_create, sc);
 	printf("\n");
 	if (bus_space_map(sc->sc_iot, PXA2X0_CLKMAN_BASE, PXA2X0_CLKMAN_SIZE,
 , &pxa2x0_clkman_ioh)) {
 		printf("%s: failed to map CLKMAN\n", device_xname(sc->sc_dev));
 		return;
+	}
 	if (bus_space_map(sc->sc_iot, PXA2X0_MEMCTL_BASE, PXA2X0_MEMCTL_SIZE,
 , &pxa2x0_memctl_ioh)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ralink_gpio.c,v 1.13 2021/09/26 01:16:07 thorpej Exp $	*/
+/*	$NetBSD: ralink_gpio.c,v 1.14 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /* ra_gpio.c -- Ralink 3052 gpio driver */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.13 2021/09/26 01:16:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.14 2022/02/12 15:51:29 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <dev/cons.h>
 #include <mips/cpuregs.h>
 @@ -650,27 +650,27 @@ ra_gpio_attach(device_t parent, device_t
 		goto fail_2;
+	}
 	/* Soft int setup */
 	sc->sc_si = softint_establish(SOFTINT_BIO, ra_gpio_softintr, sc);
 	if (sc->sc_si == NULL) {
 		ra_intr_disestablish(sc->sc_ih);
 		RALINK_DEBUG(RALINK_DEBUG_ERROR,
 			"%s: unable to establish soft interrupt\n",
 			device_xname(sc->sc_dev));
 		goto fail_3;
+	}
-	SLIST_INIT(&knotes);
+	klist_init(&knotes);
 	if (kfilter_register("CP_GPIO_EVENT", &app_fops, &app_filter_id) != 0) {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR,
 			"%s: kfilter_register for CP_GPIO_EVENT failed\n",
 			__func__);
 		goto fail_4;
+	}
 	sc->sc_gc.gp_cookie = sc;
 	sc->sc_gc.gp_pin_read = ra_gpio_pin_read;
 	sc->sc_gc.gp_pin_write = ra_gpio_pin_write;
 	sc->sc_gc.gp_pin_ctl = ra_gpio_pin_ctl;
 #if 0
 @@ -1504,43 +1504,43 @@ ra_gpio_softintr(void *arg)
  * gpio_event_app_user_attach - called when knote is ADDed
  */
 static int
 gpio_event_app_user_attach(struct knote *kn)
+{
 	RALINK_DEBUG_0(RALINK_DEBUG_INFO, "%s() %p\n", __func__, kn);
 	if (NULL == kn) {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR, "Null kn found\n");
 		return 0;
+	}
 	kn->kn_flags |= EV_CLEAR;	/* automatically set */
-	SLIST_INSERT_HEAD(&knotes, kn, kn_selnext);
+	klist_insert(&knotes, kn);
 	return 0;
+}
 /*
  * gpio_event_app_user_detach - called when knote is DELETEd
  */
 static void
 gpio_event_app_user_detach(struct knote *kn)
+{
 	RALINK_DEBUG_0(RALINK_DEBUG_INFO, "%s() %p\n", __func__, kn);
 	if (NULL == kn) {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR, "Null kn found\n");
 		return;
+	}
-	SLIST_REMOVE(&knotes, kn, knote, kn_selnext);
+	klist_remove(&knotes, kn);
+}
 /*
  * gpio_event_app_user_event - called when event is triggered
  */
 static int
 gpio_event_app_user_event(struct knote *kn, long hint)
+{
 	RALINK_DEBUG_0(RALINK_DEBUG_INFO, "%s() %p hint: %ld\n",
 	    __func__, kn, hint);
 	if (NULL == kn) {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR, "Null kn found\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xmm7360.c,v 1.14 2022/02/12 03:24:36 riastradh Exp $	*/
+/*	$NetBSD: xmm7360.c,v 1.15 2022/02/12 15:51:29 thorpej Exp $	*/
 /*
  * Device driver for Intel XMM7360 LTE modems, eg. Fibocom L850-GL.
  * Written by James Wah
  * james@laird-wah.net
+ *
  * Development of this driver was supported by genua GmbH
+ *
  * Copyright (c) 2020 genua GmbH <info@genua.de>
  * Copyright (c) 2020 James Wah <james@laird-wah.net>
+ *
  * The OpenBSD and NetBSD support was written by Jaromir Dolecek for
  * Moritz Systems Technology Company Sp. z o.o.
 @@ -65,27 +65,27 @@ MODULE_DEVICE_TABLE(pci, xmm7360_ids);
 #endif
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 #ifdef __OpenBSD__
 #include "bpfilter.h"
 #endif
 #ifdef __NetBSD__
 #include "opt_inet.h"
 #include "opt_gateway.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.14 2022/02/12 03:24:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.15 2022/02/12 15:51:29 thorpej Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/mutex.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/kthread.h>
 @@ -248,30 +248,26 @@ typedef struct kmutex spinlock_t;
 })
 #define ifq_deq_rollback(ifq, m)	m_freem(m)
 #define ifq_deq_commit(ifq, m)		/* nothing to do */
 #define ifq_is_oactive(ifq)		true	/* always restart queue */
 #define ifq_clr_oactive(ifq)		/* nothing to do */
 #define ifq_empty(ifq)			IFQ_IS_EMPTY(ifq)
 #define ifq_purge(ifq)			IF_PURGE(ifq)
 #define if_enqueue(ifp, m)		ifq_enqueue(ifp, m)
 #define if_ih_insert(ifp, func, arg)	(ifp)->_if_input = (func)
 #define if_ih_remove(ifp, func, arg)	/* nothing to do */
 #define if_hardmtu			if_mtu
 #define IF_OUTPUT_CONST			const
 #define si_note				sel_klist
 #define klist_insert(klist, kn)		\
 		SLIST_INSERT_HEAD(klist, kn, kn_selnext)
 #define klist_remove(klist, kn)		\
 		SLIST_REMOVE(klist, kn, knote, kn_selnext)
 #define XMM_KQ_ISFD_INITIALIZER		.f_flags = FILTEROP_ISFD
 #define tty_lock()			mutex_spin_enter(&tty_lock)
 #define tty_unlock()			mutex_spin_exit(&tty_lock)
 #define tty_locked()			KASSERT(mutex_owned(&tty_lock))
 #define bpfattach(bpf, ifp, dlt, sz)	bpf_attach(ifp, dlt, sz)
 #define NBPFILTER			1
 #define BPF_MTAP_OUT(ifp, m)		bpf_mtap(ifp, m, BPF_D_OUT)
 #endif /* __NetBSD__ */
 #define __user				/* nothing */
 #define copy_from_user(kbuf, userbuf, sz)		\
 ({							\
 	int __ret = 0;					\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_sync_file.c,v 1.1 2021/12/19 10:45:50 riastradh Exp $	*/
+/*	$NetBSD: linux_sync_file.c,v 1.2 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sync_file.c,v 1.1 2021/12/19 10:45:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sync_file.c,v 1.2 2022/02/12 15:51:29 thorpej Exp $");
 #include <sys/event.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/queue.h>
 #include <linux/dma-fence.h>
 #include <linux/sync_file.h>
 @@ -126,41 +126,41 @@ sync_file_poll(struct file *fp, int even
 static const struct filterops sync_file_filtops;
 static int
 sync_file_kqfilter(struct file *fp, struct knote *kn)
+{
 	struct sync_file *sf = fp->f_data;
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		kn->kn_fop = &sync_file_filtops;
 		kn->kn_hook = sf;
 		mutex_enter(&sf->sf_lock);
-		SLIST_INSERT_HEAD(&sf->sf_selq.sel_klist, kn, kn_selnext);
+		klist_insert(&sf->sf_selq.sel_klist, kn);
 		mutex_exit(&sf->sf_lock);
 		return 0;
 	default:
 		return EINVAL;
+	}
+}
 static void
 filt_sync_file_detach(struct knote *kn)
+{
 	struct sync_file *sf = kn->kn_hook;
 	mutex_enter(&sf->sf_lock);
-	SLIST_REMOVE(&sf->sf_selq.sel_klist, kn, knote, kn_selnext);
+	klist_remove(&sf->sf_selq.sel_klist, kn);
 	mutex_exit(&sf->sf_lock);
+}
 static int
 filt_sync_file_event(struct knote *kn, long hint)
+{
 	struct sync_file *sf = kn->kn_hook;
 	int ret;
 	if (hint == NOTE_SUBMIT)
 		KASSERT(mutex_owned(&sf->sf_lock));
 	else
 		mutex_enter(&sf->sf_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_event.c,v 1.139 2022/01/01 10:54:21 msaitoh Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.140 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 2008, 2009, 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -53,27 +53,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * FreeBSD: src/sys/kern/kern_event.c,v 1.27 2001/07/05 17:10:44 rwatson Exp
  */
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #endif /* _KERNEL_OPT */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.139 2022/01/01 10:54:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.140 2022/02/12 15:51:29 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/wait.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/queue.h>
 #include <sys/event.h>
 #include <sys/eventvar.h>
 #include <sys/poll.h>
 #include <sys/kmem.h>
 @@ -780,27 +780,27 @@ filt_procattach(struct knote *kn)
 	    	mutex_exit(p->p_lock);
 		return EACCES;
+	}
 	kn->kn_obj = p;
 	kn->kn_flags |= EV_CLEAR;	/* automatically set */
 	/*
 	 * NOTE_CHILD is only ever generated internally; don't let it
 	 * leak in from user-space.  See knote_proc_fork_track().
 	 */
 	kn->kn_sfflags &= ~NOTE_CHILD;
-	SLIST_INSERT_HEAD(&p->p_klist, kn, kn_selnext);
+	klist_insert(&p->p_klist, kn);
     	mutex_exit(p->p_lock);
 	return 0;
+}
 /*
  * Filter detach method for EVFILT_PROC.
+ *
  * The knote may be attached to a different process, which may exit,
  * leaving nothing for the knote to be attached to.  So when the process
  * exits, the knote is marked as DETACHED and also flagged as ONESHOT so
  * it will be deleted when read out.  However, as part of the knote deletion,
  * this routine is called, so a check is needed to avoid actually performing
 @@ -818,27 +818,27 @@ filt_procdetach(struct knote *kn)
 	 * because we can't be sure kn->kn_obj is valid unless
 	 * KN_DETACHED is not set.
 	 */
  again:
 	mutex_spin_enter(&kq->kq_lock);
 	if ((kn->kn_status & KN_DETACHED) == 0) {
 		p = kn->kn_obj;
 		if (!mutex_tryenter(p->p_lock)) {
 			mutex_spin_exit(&kq->kq_lock);
 			preempt_point();
 			goto again;
+		}
 		kn->kn_status |= KN_DETACHED;
-		SLIST_REMOVE(&p->p_klist, kn, knote, kn_selnext);
+		klist_remove(&p->p_klist, kn);
 		mutex_exit(p->p_lock);
+	}
 	mutex_spin_exit(&kq->kq_lock);
+}
 /*
  * Filter event method for EVFILT_PROC.
+ *
  * Due to some of the complexities of process locking, we have special
  * entry points for delivering knote submissions.  filt_proc() is used
  * only to check for activation from kqueue_register() and kqueue_scan().
  */
 static int
 @@ -1009,27 +1009,27 @@ knote_proc_fork_track(struct proc *p1, s
 	 * having to take p2->p_lock twice.  But this is OK because we
 	 * hold fd_lock across the entire operation.
 	 */
 	mutex_enter(p2->p_lock);
 	error = kauth_authorize_process(curlwp->l_cred,
 	    KAUTH_PROCESS_KEVENT_FILTER, p2, NULL, NULL, NULL);
 	if (__predict_false(error != 0)) {
 		mutex_exit(p2->p_lock);
 		mutex_exit(&fdp->fd_lock);
 		error = EACCES;
 		goto out;
+	}
-	SLIST_INSERT_HEAD(&p2->p_klist, kntrack, kn_selnext);
+	klist_insert(&p2->p_klist, kntrack);
 	mutex_exit(p2->p_lock);
 	KASSERT(fdp->fd_knhashmask != 0);
 	KASSERT(fdp->fd_knhash != NULL);
 	struct klist *list = &fdp->fd_knhash[KN_HASH(kntrack->kn_id,
 	    fdp->fd_knhashmask)];
 	SLIST_INSERT_HEAD(list, kntrack, kn_link);
 	SLIST_INSERT_HEAD(list, knchild, kn_link);
 	/* This adds references for knchild *and* kntrack. */
 	atomic_add_int(&kntrack->kn_kfilter->refcnt, 2);
 	knote_activate(knchild);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_proc.c,v 1.262 2020/12/24 12:14:50 nia Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.263 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.262 2020/12/24 12:14:50 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.263 2022/02/12 15:51:29 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
 #include "opt_maxuprc.h"
 #include "opt_dtrace.h"
 #include "opt_compat_netbsd32.h"
 #include "opt_kaslr.h"
 #endif
 #if defined(__HAVE_COMPAT_NETBSD32) && !defined(COMPAT_NETBSD32) \
     && !defined(_RUMPKERNEL)
 #define COMPAT_NETBSD32
 #endif
 @@ -344,27 +344,37 @@ proc_listener_cb(kauth_cred_t cred, kaut
 		break;
 	default:
 		break;
+	}
 	return result;
+}
 static int
 proc_ctor(void *arg __unused, void *obj, int flags __unused)
+{
-	memset(obj, 0, sizeof(struct proc));
+	struct proc *p = obj;
 	memset(p, 0, sizeof(*p));
 	klist_init(&p->p_klist);
 	/*
 	 * There is no need for a proc_dtor() to do a klist_fini(),
 	 * since knote_proc_exit() ensures that p->p_klist is empty
 	 * when a process exits.
 	 */
 	return 0;
+}
 static pid_t proc_alloc_pid_slot(struct proc *, uintptr_t);
 /*
  * Initialize global process hashing structures.
  */
 void
 procinit(void)
+{
 	const struct proclist_desc *pd;
 	u_int i;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sig.c,v 1.400 2021/10/27 04:45:42 thorpej Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.401 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_sig.c	8.14 (Berkeley) 5/14/95
  */
 /*
  * Signal subsystem.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.400 2021/10/27 04:45:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.401 2022/02/12 15:51:29 thorpej Exp $");
 #include "opt_execfmt.h"
 #include "opt_ptrace.h"
 #include "opt_dtrace.h"
 #include "opt_compat_sunos.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_netbsd32.h"
 #include "opt_pax.h"
 #define	SIGPROP		/* include signal properties table */
 #include <sys/param.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 @@ -2650,39 +2650,39 @@ repeat:
 			ktrpsig(signo, action, mask, &ksi);
+	}
+}
 static int
 filt_sigattach(struct knote *kn)
+{
 	struct proc *p = curproc;
 	kn->kn_obj = p;
 	kn->kn_flags |= EV_CLEAR;	/* automatically set */
 	mutex_enter(p->p_lock);
-	SLIST_INSERT_HEAD(&p->p_klist, kn, kn_selnext);
+	klist_insert(&p->p_klist, kn);
 	mutex_exit(p->p_lock);
 	return 0;
+}
 static void
 filt_sigdetach(struct knote *kn)
+{
 	struct proc *p = kn->kn_obj;
 	mutex_enter(p->p_lock);
-	SLIST_REMOVE(&p->p_klist, kn, knote, kn_selnext);
+	klist_remove(&p->p_klist, kn);
 	mutex_exit(p->p_lock);
+}
 /*
  * Signal knotes are shared with proc knotes, so we apply a mask to
  * the hint in order to differentiate them from process hints.  This
  * could be avoided by using a signal-specific knote list, but probably
  * isn't worth the trouble.
  */
 static int
 filt_signal(struct knote *kn, long hint)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_select.c,v 1.57 2021/12/10 20:36:04 andvar Exp $	*/
+/*	$NetBSD: sys_select.c,v 1.58 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran and Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -74,27 +74,27 @@
+ *
  * The <object-lock> might be a device driver or another subsystem, e.g.
  * socket or pipe.  This lock is not exported, and thus invisible to this
  * subsystem.  Mainly, synchronisation between selrecord() and selnotify()
  * routines depends on this lock, as it will be described in the comments.
+ *
  * Lock order
+ *
  *	<object-lock> ->
  *		selcluster_t::sc_lock
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.57 2021/12/10 20:36:04 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.58 2022/02/12 15:51:29 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/poll.h>
 #include <sys/mount.h>
 @@ -665,42 +665,41 @@ selrecord(lwp_t *selector, struct selinf
 		sip->sel_collision |= sc->sc_mask;
 		KASSERT(sip->sel_cluster != NULL);
+	}
+}
 /*
  * Record a knote.
+ *
  * The caller holds the same lock as for selrecord().
  */
 void
 selrecord_knote(struct selinfo *sip, struct knote *kn)
+{
-	SLIST_INSERT_HEAD(&sip->sel_klist, kn, kn_selnext);
+	klist_insert(&sip->sel_klist, kn);
+}
 /*
  * Remove a knote.
+ *
  * The caller holds the same lock as for selrecord().
+ *
  * Returns true if the last knote was removed and the list
  * is now empty.
  */
 bool
 selremove_knote(struct selinfo *sip, struct knote *kn)
+{
-	SLIST_REMOVE(&sip->sel_klist, kn, knote, kn_selnext);
+	return klist_remove(&sip->sel_klist, kn);
 	return SLIST_EMPTY(&sip->sel_klist);
+}
 /*
  * sel_setevents: a helper function for selnotify(), to set the events
  * for LWP sleeping in selcommon() or pollcommon().
  */
 static inline bool
 sel_setevents(lwp_t *l, struct selinfo *sip, const int events)
+{
 	const int oflag = l->l_selflag;
 	int ret = 0;
 	/*
 @@ -904,45 +903,48 @@ selsysinit(struct cpu_info *ci)
 		selcluster[index] = sc;
+	}
 	ci->ci_data.cpu_selcluster = sc;
+}
 /*
  * Initialize a selinfo record.
  */
 void
 selinit(struct selinfo *sip)
+{
 	memset(sip, 0, sizeof(*sip));
 	klist_init(&sip->sel_klist);
+}
 /*
  * Destroy a selinfo record.  The owning object must not gain new
  * references while this is in progress: all activity on the record
  * must be stopped.
+ *
  * Concurrency issues: we only need guard against a call to selclear()
  * by a thread exiting sel_do_scan().  The caller has prevented further
  * references being made to the selinfo record via selrecord(), and it
  * will not call selnotify() again.
  */
 void
 seldestroy(struct selinfo *sip)
+{
 	selcluster_t *sc;
 	kmutex_t *lock;
 	lwp_t *l;
 	klist_fini(&sip->sel_klist);
 	if (sip->sel_lwp == NULL)
 		return;
 	/*
 	 * Lock out selclear().  The selcluster pointer can't change while
 	 * we are here since it is only ever changed in selrecord(),
 	 * and that will not be entered again for this record because
 	 * it is dying.
 	 */
 	KASSERT(sip->sel_cluster != NULL);
 	sc = sip->sel_cluster;
 	lock = sc->sc_lock;
 	mutex_spin_enter(lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_init.c,v 1.53 2021/09/26 21:29:38 thorpej Exp $	*/
+/*	$NetBSD: vfs_init.c,v 1.54 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_init.c	8.5 (Berkeley) 5/11/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.53 2021/09/26 21:29:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.54 2022/02/12 15:51:29 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/namei.h>
 #include <sys/ucred.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/module.h>
 @@ -446,28 +446,30 @@ vfsinit(void)
 	 * Initialise VFS hooks.
 	 */
 	vfs_hooks_init();
 	mount_listener = kauth_listen_scope(KAUTH_SCOPE_SYSTEM,
 	    mount_listener_cb, NULL);
 	/*
 	 * Establish each file system which was statically
 	 * included in the kernel.
 	 */
 	module_init_class(MODULE_CLASS_VFS);
-	extern kmutex_t fs_klist_lock;
+	/*
-	mutex_init(&fs_klist_lock, MUTEX_DEFAULT, IPL_NONE);
+	 * Initialize EVFILT_FS for kqueue.
 	 */
 	vfs_evfilt_fs_init();
+}
 /*
  * Drop a reference to a file system type.
  */
 void
 vfs_delref(struct vfsops *vfs)
+{
 	mutex_enter(&vfs_list_lock);
 	vfs->vfs_refcount--;
 	mutex_exit(&vfs_list_lock);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.554 2021/11/07 13:47:50 christos Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.555 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_syscalls.c	8.42 (Berkeley) 7/31/95
  */
 /*
  * Virtual File System System Calls
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.554 2021/11/07 13:47:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.555 2022/02/12 15:51:29 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
 #include "veriexec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>
 @@ -158,48 +158,55 @@ const char * const mountcompatnames[] =
 	MOUNT_MSDOS,	/* 4 */
 	MOUNT_CD9660,	/* 5 = MOUNT_ISOFS */
 	MOUNT_FDESC,	/* 6 */
 	MOUNT_KERNFS,	/* 7 */
 	NULL,		/* 8 = MOUNT_DEVFS */
 	MOUNT_AFS,	/* 9 */
 };
 const u_int nmountcompatnames = __arraycount(mountcompatnames);
 /*
  * Filter event method for EVFILT_FS.
  */
-static struct klist fs_klist = SLIST_HEAD_INITIALIZER(&fs_klist);
+static struct klist fs_klist;
-kmutex_t fs_klist_lock;
+static kmutex_t fs_klist_lock;
 CTASSERT((NOTE_SUBMIT & VQ_MOUNT) == 0);
 CTASSERT((NOTE_SUBMIT & VQ_UNMOUNT) == 0);
 void
 vfs_evfilt_fs_init(void)
+{
 	klist_init(&fs_klist);
 	mutex_init(&fs_klist_lock, MUTEX_DEFAULT, IPL_NONE);
+}
 static int
 filt_fsattach(struct knote *kn)
+{
 	mutex_enter(&fs_klist_lock);
 	kn->kn_flags |= EV_CLEAR;
-	SLIST_INSERT_HEAD(&fs_klist, kn, kn_selnext);
+	klist_insert(&fs_klist, kn);
 	mutex_exit(&fs_klist_lock);
 	return 0;
+}
 static void
 filt_fsdetach(struct knote *kn)
+{
 	mutex_enter(&fs_klist_lock);
-	SLIST_REMOVE(&fs_klist, kn, knote, kn_selnext);
+	klist_remove(&fs_klist, kn);
 	mutex_exit(&fs_klist_lock);
+}
 static int
 filt_fs(struct knote *kn, long hint)
+{
 	int rv;
 	if (hint & NOTE_SUBMIT) {
 		KASSERT(mutex_owned(&fs_klist_lock));
 		kn->kn_fflags |= hint & ~NOTE_SUBMIT;
 	} else {
 		mutex_enter(&fs_klist_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_vnode.c,v 1.129 2022/02/08 08:57:11 hannken Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.130 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 1997-2011, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -138,27 +138,27 @@
+ *
  * Reference counting
+ *
  *	Vnode is considered active, if reference count (vnode_t::v_usecount)
  *	is non-zero.  It is maintained using: vref(9) and vrele(9), as well
  *	as vput(9), routines.  Common points holding references are e.g.
  *	file openings, current working directory, mount points, etc.
+ *
  *	v_usecount is adjusted with atomic operations, however to change
  *	from a non-zero value to zero the interlock must also be held.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.129 2022/02/08 08:57:11 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.130 2022/02/12 15:51:29 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_pax.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/hash.h>
 @@ -434,43 +434,45 @@ vfs_vnode_sysinit(void)
 vnode_t *
 vnalloc_marker(struct mount *mp)
+{
 	vnode_impl_t *vip;
 	vnode_t *vp;
 	vip = pool_cache_get(vcache_pool, PR_WAITOK);
 	memset(vip, 0, sizeof(*vip));
 	vp = VIMPL_TO_VNODE(vip);
 	uvm_obj_init(&vp->v_uobj, &uvm_vnodeops, true, 1);
 	vp->v_mount = mp;
 	vp->v_type = VBAD;
 	vp->v_interlock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 	klist_init(&vp->v_klist);
 	vip->vi_state = VS_MARKER;
 	return vp;
+}
 /*
  * Free a marker vnode.
  */
 void
 vnfree_marker(vnode_t *vp)
+{
 	vnode_impl_t *vip;
 	vip = VNODE_TO_VIMPL(vp);
 	KASSERT(vip->vi_state == VS_MARKER);
 	mutex_obj_free(vp->v_interlock);
 	uvm_obj_destroy(&vp->v_uobj, true);
 	klist_fini(&vp->v_klist);
 	pool_cache_put(vcache_pool, vip);
+}
 /*
  * Test a vnode for being a marker vnode.
  */
 bool
 vnis_marker(vnode_t *vp)
+{
 	return (VNODE_TO_VIMPL(vp)->vi_state == VS_MARKER);
+}
 @@ -1297,26 +1299,27 @@ static vnode_impl_t *
 vcache_alloc(void)
+{
 	vnode_impl_t *vip;
 	vnode_t *vp;
 	vip = pool_cache_get(vcache_pool, PR_WAITOK);
 	vp = VIMPL_TO_VNODE(vip);
 	memset(vip, 0, sizeof(*vip));
 	rw_init(&vip->vi_lock);
 	vp->v_interlock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 	uvm_obj_init(&vp->v_uobj, &uvm_vnodeops, true, 1);
 	klist_init(&vp->v_klist);
 	cv_init(&vp->v_cv, "vnode");
 	cache_vnode_init(vp);
 	vp->v_usecount = 1;
 	vp->v_type = VNON;
 	vp->v_size = vp->v_writesize = VSIZENOTSET;
 	vip->vi_state = VS_LOADING;
 	lru_requeue(vp, &lru_list[LRU_FREE]);
 	return vip;
+}
 @@ -1358,26 +1361,27 @@ vcache_free(vnode_impl_t *vip)
 	KASSERT(vrefcnt(vp) == 0);
 	KASSERT(vp->v_holdcnt == 0);
 	KASSERT(vp->v_writecount == 0);
 	lru_requeue(vp, NULL);
 	mutex_exit(vp->v_interlock);
 	vfs_insmntque(vp, NULL);
 	if (vp->v_type == VBLK || vp->v_type == VCHR)
 		spec_node_destroy(vp);
 	mutex_obj_free(vp->v_interlock);
 	rw_destroy(&vip->vi_lock);
 	uvm_obj_destroy(&vp->v_uobj, true);
 	klist_fini(&vp->v_klist);
 	cv_destroy(&vp->v_cv);
 	cache_vnode_fini(vp);
 	pool_cache_put(vcache_pool, vip);
+}
 /*
  * Try to get an initial reference on this cached vnode.
  * Returns zero on success or EBUSY if the vnode state is not LOADED.
+ *
  * NB: lockless code sequences may rely on this not blocking.
  */
 int
 vcache_tryvget(vnode_t *vp)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: event.h,v 1.51 2021/10/23 01:28:33 thorpej Exp $	*/
+/*	$NetBSD: event.h,v 1.52 2022/02/12 15:51:29 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -324,26 +324,51 @@ int	kevent_fetch_changes(void *, const s
     size_t, int);
 int 	kevent_put_events(void *, struct kevent *, struct kevent *, size_t,
     int);
 int	kevent1(register_t *, int, const struct kevent *,
     size_t, struct kevent *, size_t, const struct timespec *,
     const struct kevent_ops *);
 int	kfilter_register(const char *, const struct filterops *, int *);
 int	kfilter_unregister(const char *);
 int	filt_seltrue(struct knote *, long);
 extern const struct filterops seltrue_filtops;
 static inline void
 klist_init(struct klist *list)
+{
 	SLIST_INIT(list);
+}
 static inline void
 klist_fini(struct klist *list)
+{
 	/* Nothing, for now. */
+}
 static inline void
 klist_insert(struct klist *list, struct knote *kn)
+{
 	SLIST_INSERT_HEAD(list, kn, kn_selnext);
+}
 static inline bool
 klist_remove(struct klist *list, struct knote *kn)
+{
 	SLIST_REMOVE(list, kn, knote, kn_selnext);
 	return SLIST_EMPTY(list);
+}
 #else 	/* !_KERNEL */
 #include <sys/cdefs.h>
 struct timespec;
 __BEGIN_DECLS
 #if defined(_NETBSD_SOURCE)
 int	kqueue(void);
 int	kqueue1(int);
 #ifndef __LIBC12_SOURCE__
 int	kevent(int, const struct kevent *, size_t, struct kevent *, size_t,
 		    const struct timespec *) __RENAME(__kevent50);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mount.h,v 1.237 2021/02/04 21:07:06 jdolecek Exp $	*/
+/*	$NetBSD: mount.h,v 1.238 2022/02/12 15:51:29 thorpej Exp $	*/
 /*
  * Copyright (c) 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -440,26 +440,27 @@ void	vfs_syncer_remove_from_worklist(str
 extern	struct vfsops *vfssw[];			/* filesystem type table */
 extern	int nvfssw;
 extern	kmutex_t vfs_list_lock;
 void	vfs_mount_sysinit(void);
 long	makefstype(const char *);
 int	mount_domount(struct lwp *, struct vnode **, struct vfsops *,
 	    const char *, int, void *, size_t *);
 int	dounmount(struct mount *, int, struct lwp *);
 int	do_sys_mount(struct lwp *, const char *, enum uio_seg, const char *,
 	    int, void *, enum uio_seg, size_t, register_t *);
 void	vfsinit(void);
 void	vfs_evfilt_fs_init(void);
 void	vfs_opv_init(const struct vnodeopv_desc * const *);
 void	vfs_opv_free(const struct vnodeopv_desc * const *);
 #ifdef DEBUG
 void	vfs_bufstats(void);
 #endif
 int	mount_specific_key_create(specificdata_key_t *, specificdata_dtor_t);
 void	mount_specific_key_delete(specificdata_key_t);
 void 	mount_initspecific(struct mount *);
 void 	mount_finispecific(struct mount *);
 void *	mount_getspecific(struct mount *, specificdata_key_t);
 void	mount_setspecific(struct mount *, specificdata_key_t, void *);