Module Name: src
Committed By: rmind
Date: Sun Apr 3 01:20:24 UTC 2011
Modified Files:
src/sys/kern: vfs_mount.c
Log Message:
vfs_insmntque: convert check to assert.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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.3 src/sys/kern/vfs_mount.c:1.4
--- src/sys/kern/vfs_mount.c:1.3 Sat Apr 2 06:48:20 2011
+++ src/sys/kern/vfs_mount.c Sun Apr 3 01:20:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.3 2011/04/02 06:48:20 rmind Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.4 2011/04/03 01:20:23 rmind 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.3 2011/04/02 06:48:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.4 2011/04/03 01:20:23 rmind Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -376,13 +376,8 @@
{
struct mount *omp;
-#ifdef DIAGNOSTIC
- if ((mp != NULL) &&
- (mp->mnt_iflag & IMNT_UNMOUNT) &&
- vp->v_tag != VT_VFS) {
- panic("insmntque into dying filesystem");
- }
-#endif
+ KASSERT(mp == NULL || (mp->mnt_iflag & IMNT_UNMOUNT) == 0 ||
+ vp->v_tag == VT_VFS);
mutex_enter(&mntvnode_lock);
/*
