[src/yamt-pagecache]: src/sys/kern adapt assertions to this branch

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

details:   https://anonhg.NetBSD.org/src/rev/bd16f34eeac0
branches:  yamt-pagecache
changeset: 770912:bd16f34eeac0
user:      yamt <yamt%NetBSD.org@localhost>
date:      Thu May 22 19:11:17 2014 +0000

description:
adapt assertions to this branch

diffstat:

 sys/kern/vfs_vnode.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 8acb67a1a0af -r bd16f34eeac0 sys/kern/vfs_vnode.c
--- a/sys/kern/vfs_vnode.c      Thu May 22 19:10:31 2014 +0000
+++ b/sys/kern/vfs_vnode.c      Thu May 22 19:11:17 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_vnode.c,v 1.14.2.5 2014/05/22 11:41:04 yamt Exp $  */
+/*     $NetBSD: vfs_vnode.c,v 1.14.2.6 2014/05/22 19:11:17 yamt Exp $  */
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.14.2.5 2014/05/22 11:41:04 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.14.2.6 2014/05/22 19:11:17 yamt Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -414,7 +414,7 @@
        uobj = &vp->v_uobj;
        KASSERT(uobj->pgops == &uvm_vnodeops);
        KASSERT(uobj->uo_npages == 0);
-       KASSERT(TAILQ_FIRST(&uobj->memq) == NULL);
+       KASSERT(radix_tree_empty_tree_p(&uobj->uo_pages));
 
        /* Share the vnode_t::v_interlock, if requested. */
        if (slock) {
@@ -1034,6 +1034,7 @@
 
        KASSERT(vp->v_data == NULL);
        KASSERT(vp->v_uobj.uo_npages == 0);
+       KASSERT(radix_tree_empty_tree_p(&vp->v_uobj.uo_pages));
 
        if (vp->v_type == VREG && vp->v_ractx != NULL) {
                uvm_ra_freectx(vp->v_ractx);