Module Name: src
Committed By: hannken
Date: Fri May 1 08:45:01 UTC 2020
Modified Files:
src/sys/kern: vfs_mount.c
Log Message:
Undo Rev. 1.79, it breaks root-on-raid where it destroys the component
disks before the raid:
forcefully unmounting / (/dev/raid0a)...
sd1: detached
sd0: detached
raid0: cache flush to component /dev/sd0a failed.
raid0: cache flush to component /dev/sd1a failed.
fatal page fault in supervisor mode
Stopped in pid 2356.2356 (reboot) at netbsd:sdstrategy+0x36
Reopens PR kern/54969: Disk cache is no longer flushed on shutdown
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/kern/vfs_mount.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/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.81 src/sys/kern/vfs_mount.c:1.82
--- src/sys/kern/vfs_mount.c:1.81 Tue Apr 21 21:42:47 2020
+++ src/sys/kern/vfs_mount.c Fri May 1 08:45:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.81 2020/04/21 21:42:47 ad Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.82 2020/05/01 08:45:01 hannken Exp $ */
/*-
* Copyright (c) 1997-2020 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.81 2020/04/21 21:42:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.82 2020/05/01 08:45:01 hannken Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -114,8 +114,6 @@ static struct vnode *vfs_vnode_iterator_
/* 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 __cacheline_aligned;
@@ -1016,7 +1014,6 @@ 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;
@@ -1051,24 +1048,6 @@ vfs_unmountall1(struct lwp *l, bool forc
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;
}
