[src/netbsd-9]: src/sys/kern Pull up following revision(s) (requested by gson...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64468d3e9b61
branches:  netbsd-9
changeset: 1001664:64468d3e9b61
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 22 18:05:11 2020 +0000

description:
Pull up following revision(s) (requested by gson in ticket #839):

        sys/kern/vfs_mount.c: revision 1.79

Destroy anonymous device vnodes on reboot once the last file system
got unmounted and the mount list is empty.

PR kern/54969: Disk cache is no longer flushed on shutdown

diffstat:

 sys/kern/vfs_mount.c |  25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r cc3e218b6297 -r 64468d3e9b61 sys/kern/vfs_mount.c
--- a/sys/kern/vfs_mount.c      Wed Apr 22 17:55:16 2020 +0000
+++ b/sys/kern/vfs_mount.c      Wed Apr 22 18:05:11 2020 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -67,7 +67,7 @@
  */
 
 #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>
@@ -114,6 +114,8 @@
 /* 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;
@@ -1000,6 +1002,7 @@
 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;
@@ -1034,6 +1037,24 @@
        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;
 }