 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_mount.c,v 1.70 2019/02/20 10:08:37 hannken Exp $	*/
+/*	$NetBSD: vfs_mount.c,v 1.70.4.1 2020/04/22 18:05:11 martin Exp $	*/
 /*-
  * Copyright (c) 1997-2011 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.70 2019/02/20 10:08:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.70.4.1 2020/04/22 18:05:11 martin 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>
 @@ -104,26 +104,28 @@ struct mountlist_entry {
 						   current mount else. */
 	enum mountlist_type me_type;		/* Mount or marker. */
 };
 struct mount_iterator {
 	struct mountlist_entry mi_entry;
 };
 static struct vnode *vfs_vnode_iterator_next1(struct vnode_iterator *,
     bool (*)(void *, struct vnode *), void *, bool);
 /* Root filesystem. */
 vnode_t *			rootvnode;
 extern struct mount		*dead_rootmount;
 /* Mounted filesystem list. */
 static TAILQ_HEAD(mountlist, mountlist_entry) mountlist;
 static kmutex_t			mountlist_lock;
 int vnode_offset_next_by_lru	/* XXX: ugly hack for pstat.c */
     = offsetof(vnode_impl_t, vi_lrulist.tqe_next);
 kmutex_t			mntvnode_lock;
 kmutex_t			vfs_list_lock;
 static specificdata_domain_t	mount_specificdata_domain;
 static kmutex_t			mntid_lock;
 static kmutex_t			mountgen_lock;
 @@ -990,26 +992,27 @@ vfs_unmount_forceone(struct lwp *l)
 #ifdef DEBUG
 	printf("forceful unmount of %s failed with error %d\n",
 	    mp->mnt_stat.f_mntonname, error);
 #endif
 	return false;
+}
 bool
 vfs_unmountall1(struct lwp *l, bool force, bool verbose)
+{
 	struct mount *mp;
 	mount_iterator_t *iter;
 	bool any_error = false, progress = false;
 	uint64_t gen;
 	int error;
 	gen = mountgen;
 	for (;;) {
 		mp = vfs_unmount_next(gen);
 		if (mp == NULL)
 			break;
 		gen = mp->mnt_gen;
 #ifdef DEBUG
 		printf("unmounting %p %s (%s)...\n",
 @@ -1024,26 +1027,44 @@ vfs_unmountall1(struct lwp *l, bool forc
 			if (verbose) {
 				printf("unmount of %s failed with error %d\n",
 				    mp->mnt_stat.f_mntonname, error);
+			}
 			any_error = true;
+		}
+	}
 	if (verbose) {
 		printf("unmounting done\n");
+	}
 	if (any_error && verbose) {
 		printf("WARNING: some file systems would not unmount\n");
+	}
 	/* If the mountlist is empty destroy anonymous device vnodes. */
 	mountlist_iterator_init(&iter);
 	if (mountlist_iterator_next(iter) == NULL) {
 		struct vnode_iterator *marker;
 		vnode_t *vp;
 		vfs_vnode_iterator_init(dead_rootmount, &marker);
 		while ((vp = vfs_vnode_iterator_next(marker, NULL, NULL))) {
 			if (vp->v_type == VCHR || vp->v_type == VBLK)
 				vgone(vp);
 			else
 				vrele(vp);
+		}
 		vfs_vnode_iterator_destroy(marker);
+	}
 	mountlist_iterator_destroy(iter);
 	return progress;
+}
 void
 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. */