 @@ -1,14 +1,14 @@
-/* $NetBSD: kern_pmf.c,v 1.41 2020/02/23 20:08:35 ad Exp $ */
+/* $NetBSD: kern_pmf.c,v 1.42 2020/04/20 21:39:05 ad Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * 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: kern_pmf.c,v 1.41 2020/02/23 20:08:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.42 2020/04/20 21:39:05 ad Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/pmf.h>
 #include <sys/queue.h>
 #include <sys/sched.h>
 #include <sys/workqueue.h>
 #include <prop/proplib.h>
 @@ -307,27 +307,27 @@ pmf_system_suspend(const pmf_qual_t *qua
 #if NWSDISPLAY > 0
 	if (wsdisplay_handlex(0))
 		return false;
 #endif
 	KERNEL_LOCK(1, NULL);
 	/*
 	 * Flush buffers only if the shutdown didn't do so
 	 * already and if there was no panic.
 	 */
 	if (doing_shutdown == 0 && panicstr == NULL) {
 		printf("Flushing disk caches: ");
 		do_sys_sync(&lwp0);
-		if (buf_syncwait() != 0)
+		if (vfs_syncwait() != 0)
 			printf("giving up\n");
 		else
 			printf("done\n");
+	}
 	aprint_debug("Suspending devices:");
 	for (curdev = deviter_first(&di, DEVITER_F_LEAVES_FIRST);
 	     curdev != NULL;
 	     curdev = deviter_next(&di)) {
 		if (!device_is_active(curdev))
 			continue;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_bio.c,v 1.293 2020/04/11 14:48:19 jdolecek Exp $	*/
+/*	$NetBSD: vfs_bio.c,v 1.294 2020/04/20 21:39:05 ad Exp $	*/
 /*-
  * Copyright (c) 2007, 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, and by Wasabi Systems, Inc.
+ *
  * 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.
 @@ -113,27 +113,27 @@
  * - bufcache_lock: protects global buffer cache state.
  * - BC_BUSY: a long term per-buffer lock.
  * - buf_t::b_objlock: lock on completion (biowait vs biodone).
+ *
  * For buffers associated with vnodes (a most common case) b_objlock points
  * to the vnode_t::v_interlock.  Otherwise, it points to generic buffer_lock.
+ *
  * Lock order:
  *	bufcache_lock ->
  *		buf_t::b_objlock
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.293 2020/04/11 14:48:19 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.294 2020/04/20 21:39:05 ad Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_bufcache.h"
 #include "opt_dtrace.h"
 #include "opt_biohist.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 @@ -1698,77 +1698,26 @@ biointr(void *cookie)
 		bp = TAILQ_FIRST(&ci->ci_data.cpu_biodone);
 		TAILQ_REMOVE(&ci->ci_data.cpu_biodone, bp, b_actq);
 		splx(s);
 		BIOHIST_LOG(biohist, "bp=%#jx", (uintptr_t)bp, 0, 0, 0);
 		biodone2(bp);
 		s = splvm();
+	}
 	splx(s);
+}
 /*
  * Wait for all buffers to complete I/O
  * Return the number of "stuck" buffers.
  */
 int
 buf_syncwait(void)
 	buf_t *bp;
 	int iter, nbusy, nbusy_prev = 0, ihash;
 	BIOHIST_FUNC(__func__); BIOHIST_CALLED(biohist);
 	for (iter = 0; iter < 20;) {
 		mutex_enter(&bufcache_lock);
 		nbusy = 0;
 		for (ihash = 0; ihash < bufhash+1; ihash++) {
 		    LIST_FOREACH(bp, &bufhashtbl[ihash], b_hash) {
 			if ((bp->b_cflags & (BC_BUSY|BC_INVAL)) == BC_BUSY)
 				nbusy += ((bp->b_flags & B_READ) == 0);
 		mutex_exit(&bufcache_lock);
 		if (nbusy == 0)
 			break;
 		if (nbusy_prev == 0)
 			nbusy_prev = nbusy;
 		printf("%d ", nbusy);
 		kpause("bflush", false, MAX(1, hz / 25 * iter), NULL);
 		if (nbusy >= nbusy_prev) /* we didn't flush anything */
 			iter++;
 		else
 			nbusy_prev = nbusy;
 	if (nbusy) {
 #if defined(DEBUG) || defined(DEBUG_HALT_BUSY)
 		printf("giving up\nPrinting vnodes for busy buffers\n");
 		for (ihash = 0; ihash < bufhash+1; ihash++) {
 		    LIST_FOREACH(bp, &bufhashtbl[ihash], b_hash) {
 			if ((bp->b_cflags & (BC_BUSY|BC_INVAL)) == BC_BUSY &&
 			    (bp->b_flags & B_READ) == 0)
 				vprint(NULL, bp->b_vp);
 #endif
 	return nbusy;
 static void
 sysctl_fillbuf(const buf_t *i, struct buf_sysctl *o)
+{
 	const bool allowaddr = get_expose_address(curproc);
 	memset(o, 0, sizeof(*o));
 	o->b_flags = i->b_flags | i->b_cflags | i->b_oflags;
 	o->b_error = i->b_error;
 	o->b_prio = i->b_prio;
 	o->b_dev = i->b_dev;
 	o->b_bufsize = i->b_bufsize;
 	o->b_bcount = i->b_bcount;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_mount.c,v 1.79 2020/04/19 13:26:17 hannken Exp $	*/
+/*	$NetBSD: vfs_mount.c,v 1.80 2020/04/20 21:39:05 ad Exp $	*/
 /*-
  * Copyright (c) 1997-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
 @@ -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_subr.c	8.13 (Berkeley) 4/18/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.79 2020/04/19 13:26:17 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.80 2020/04/20 21:39:05 ad Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/device.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 @@ -1083,27 +1083,27 @@ vfs_sync_all(struct lwp *l)
+{
 	printf("syncing disks... ");
 	/* remove user processes from run queue */
 	suspendsched();
 	(void)spl0();
 	/* avoid coming back this way again if we panic. */
 	doing_shutdown = 1;
 	do_sys_sync(l);
 	/* Wait for sync to finish. */
-	if (buf_syncwait() != 0) {
+	if (vfs_syncwait() != 0) {
 #if defined(DDB) && defined(DEBUG_HALT_BUSY)
 		Debugger();
 #endif
 		printf("giving up\n");
 		return;
 	} else
 		printf("done\n");
+}
 /*
  * Sync and unmount file systems before shutting down.
  */
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.545 2020/04/04 20:49:30 ad Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.546 2020/04/20 21:39:05 ad 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.545 2020/04/04 20:49:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.546 2020/04/20 21:39:05 ad 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>
 @@ -662,26 +662,92 @@ do_sys_sync(struct lwp *l)
 			VFS_SYNC(mp, MNT_NOWAIT, l->l_cred);
 			if (asyncflag)
 				 mp->mnt_flag |= MNT_ASYNC;
+		}
 		mutex_exit(mp->mnt_updating);
+	}
 	mountlist_iterator_destroy(iter);
 #ifdef DEBUG
 	if (syncprt)
 		vfs_bufstats();
 #endif /* DEBUG */
+}
 static bool
 sync_vnode_filter(void *cookie, vnode_t *vp)
+{
 	if (vp->v_numoutput > 0) {
 		++*(int *)cookie;
+	}
 	return false;
+}
 int
 vfs_syncwait(void)
+{
 	int nbusy, nbusy_prev, iter;
 	struct vnode_iterator *vniter;
 	mount_iterator_t *mpiter;
 	struct mount *mp;
 	for (nbusy_prev = 0, iter = 0; iter < 20;) {
 		nbusy = 0;
 		mountlist_iterator_init(&mpiter);
 		while ((mp = mountlist_iterator_next(mpiter)) != NULL) {
 			vnode_t *vp __diagused;
 			vfs_vnode_iterator_init(mp, &vniter);
 			vp = vfs_vnode_iterator_next(vniter,
 			    sync_vnode_filter, &nbusy);
 			KASSERT(vp == NULL);
 			vfs_vnode_iterator_destroy(vniter);
+		}
 		mountlist_iterator_destroy(mpiter);
 		if (nbusy == 0)
 			break;
 		if (nbusy_prev == 0)
 			nbusy_prev = nbusy;
 		printf("%d ", nbusy);
 		kpause("syncwait", false, MAX(1, hz / 25 * iter), NULL);
 		if (nbusy >= nbusy_prev) /* we didn't flush anything */
 			iter++;
 		else
 			nbusy_prev = nbusy;
+	}
 	if (nbusy) {
 #if defined(DEBUG) || defined(DEBUG_HALT_BUSY)
 		printf("giving up\nPrinting vnodes for busy buffers\n");
 		mountlist_iterator_init(&mpiter);
 		while ((mp = mountlist_iterator_next(mpiter)) != NULL) {
 			vnode_t *vp;
 			vfs_vnode_iterator_init(mp, &vniter);
 			vp = vfs_vnode_iterator_next(vniter,
 			    NULL, NULL);
 			mutex_enter(vp->v_interlock);
 			if (vp->v_numoutput > 0)
 				vprint(NULL, vp);
 			mutex_exit(vp->v_interlock);
 			vrele(vp);
 			vfs_vnode_iterator_destroy(vniter);
+		}
 		mountlist_iterator_destroy(mpiter);
 #endif
+	}
 	return nbusy;
+}
 /* ARGSUSED */
 int
 sys_sync(struct lwp *l, const void *v, register_t *retval)
+{
 	do_sys_sync(l);
 	return (0);
+}
 /*
  * Access or change filesystem quotas.
+ *
  * (this is really 14 different calls bundled into one)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump_vfs.c,v 1.91 2020/04/13 19:23:20 ad Exp $	*/
+/*	$NetBSD: rump_vfs.c,v 1.92 2020/04/20 21:39:05 ad Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * 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
 @@ -19,27 +19,27 @@
  * 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.91 2020/04/13 19:23:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.92 2020/04/20 21:39:05 ad Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/evcnt.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/fstrans.h>
 #include <sys/lockf.h>
 #include <sys/kthread.h>
 #include <sys/module.h>
 #include <sys/namei.h>
 #include <sys/queue.h>
 @@ -460,27 +460,27 @@ int
 rump_vfs_extattrctl(struct mount *mp, int cmd, struct vnode *vp,
 	int attrnamespace, const char *attrname)
+{
 	return VFS_EXTATTRCTL(mp, cmd, vp, attrnamespace, attrname);
+}
 /*ARGSUSED*/
 void
 rump_vfs_syncwait(struct mount *mp)
+{
 	int n;
-	n = buf_syncwait();
+	n = vfs_syncwait();
 	if (n)
 		printf("syncwait: unsynced buffers: %d\n", n);
+}
 /*
  * Dump info about mount point.  No locking.
  */
 static bool
 rump_print_selector(void *cl, struct vnode *vp)
+{
 	int *full = cl;
 	KASSERT(mutex_owned(vp->v_interlock));

 @@ -1,14 +1,14 @@
-/*     $NetBSD: buf.h,v 1.132 2020/04/10 17:18:04 ad Exp $ */
+/*     $NetBSD: buf.h,v 1.133 2020/04/20 21:39:05 ad Exp $ */
 /*-
  * Copyright (c) 1999, 2000, 2007, 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, 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
 @@ -289,27 +289,26 @@ void	brelsel(buf_t *, int);
 void	brelse(buf_t *, int);
 /*
  * So-far indeterminate ops that might belong to either
  * bufferio(9) or buffercache(9).
  */
 void	bremfree(buf_t *);
 void	bufinit(void);
 void	bufinit2(void);
 void	minphys(buf_t *);
 void	brelvp(buf_t *);
 void	reassignbuf(buf_t *, struct vnode *);
 void	bgetvp(struct vnode *, buf_t *);
 int	buf_syncwait(void);
 u_long	buf_memcalc(void);
 int	buf_drain(int);
 int	buf_setvalimit(vsize_t);
 #if defined(DDB) || defined(DEBUGPRINT)
 void	vfs_buf_print(buf_t *, int, void (*)(const char *, ...)
     __printflike(1, 2));
 #endif
 void	buf_init(buf_t *);
 void	buf_destroy(buf_t *);
 int	bbusy(buf_t *, bool, int, kmutex_t *);
 u_int	buf_nbuf(void);
 void	biohist_init(void);

 @@ -1,14 +1,14 @@
-/*     $NetBSD: vfs_syscalls.h,v 1.27 2020/02/23 22:14:04 ad Exp $        */
+/*     $NetBSD: vfs_syscalls.h,v 1.28 2020/04/20 21:39:05 ad Exp $        */
 /*
  * Copyright (c) 2007, 2008, 2009 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.
 @@ -70,21 +70,22 @@ int dofhopen(struct lwp *, const void *,
 int	do_sys_linkat(struct lwp *, int, const char *, int, const char *, int, register_t *);
 int	do_sys_unlink(const char *, enum uio_seg);
 int	do_sys_rename(const char *, const char *, enum uio_seg, int);
 int	do_posix_mknodat(struct lwp *, int, const char *, mode_t, dev_t);
 int	do_sys_mknod(struct lwp *, const char *, mode_t, dev_t, enum uio_seg);
 int	do_sys_mknodat(struct lwp *, int, const char *, mode_t, dev_t, enum uio_seg);
 int	do_sys_chmodat(struct lwp *, int, const char *, int, int);
 int	do_sys_chownat(struct lwp *, int, const char *, uid_t, gid_t, int);
 int	do_sys_accessat(struct lwp *, int, const char *, int ,int);
 int	do_sys_mkdir(const char *, mode_t, enum uio_seg);
 int	do_sys_symlink(const char *, const char *, enum uio_seg);
 int	do_sys_quotactl(const char *, const struct quotactl_args *);
 void	do_sys_sync(struct lwp *);
 int	vfs_syncwait(void);
 int	chdir_lookup(const char *, int, struct vnode **, struct lwp *);
 void	change_root(struct vnode *);
 extern const char *const mountcompatnames[];
 extern const u_int nmountcompatnames;
 #endif /* _SYS_VFS_SYSCALLS_H_ */