Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern fix typo.



details:   https://anonhg.NetBSD.org/src/rev/aa9fa3ecbde3
branches:  trunk
changeset: 769141:aa9fa3ecbde3
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Sep 01 12:15:07 2011 +0000

description:
fix typo.

diffstat:

 sys/kern/vfs_mount.c |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r f63e68f007ce -r aa9fa3ecbde3 sys/kern/vfs_mount.c
--- a/sys/kern/vfs_mount.c      Thu Sep 01 09:33:01 2011 +0000
+++ b/sys/kern/vfs_mount.c      Thu Sep 01 12:15:07 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_mount.c,v 1.7 2011/09/01 09:04:08 christos Exp $   */
+/*     $NetBSD: vfs_mount.c,v 1.8 2011/09/01 12:15:07 christos 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.7 2011/09/01 09:04:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.8 2011/09/01 12:15:07 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -89,6 +89,8 @@
 #include <sys/vfs_syscalls.h>
 #include <sys/vnode.h>
 
+#include <uvm/uvm_swap.h>
+
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/syncfs/syncfs.h>
 #include <miscfs/specfs/specdev.h>
@@ -1016,6 +1018,14 @@
                return;
        }
 
+#if defined(_KERNEL) && !defined(_RUMPKERNEL)
+       /*
+        * We need to turn off swap first before we unmount
+        * /dev, because otherwise the spec_vnodes are bad.
+        */
+       uvm_swap_shutdown(l);
+#endif
+
        /* Unmount file systems. */
        vfs_unmountall(l);
 }
@@ -1268,7 +1278,7 @@
        mutex_enter(&device_lock);
        for (vq = specfs_hash[SPECHASH(vp->v_rdev)]; vq != NULL;
            vq = vq->v_specnext) {
-               if (vq->v_type != vp->type || vq->v_rdev != vp->v_rdev)
+               if (vq->type != vp->type || vq->v_rdev != vp->v_rdev)
                        continue;
                if (vq->v_specmountpoint != NULL) {
                        error = EBUSY;



Home | Main Index | Thread Index | Old Index