Module Name: src
Committed By: yamt
Date: Mon Nov 14 14:23:16 UTC 2011
Modified Files:
src/sys/uvm [yamt-pagecache]: uvm_fault.c
Log Message:
assertions
To generate a diff of this commit:
cvs rdiff -u -r1.190.2.1 -r1.190.2.2 src/sys/uvm/uvm_fault.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/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.190.2.1 src/sys/uvm/uvm_fault.c:1.190.2.2
--- src/sys/uvm/uvm_fault.c:1.190.2.1 Wed Nov 2 21:54:00 2011
+++ src/sys/uvm/uvm_fault.c Mon Nov 14 14:23:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.190.2.1 2011/11/02 21:54:00 yamt Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.190.2.2 2011/11/14 14:23:16 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.190.2.1 2011/11/02 21:54:00 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.190.2.2 2011/11/14 14:23:16 yamt Exp $");
#include "opt_uvmhist.h"
@@ -1186,7 +1186,10 @@ uvm_fault_upper_neighbor(
UVMHIST_FUNC("uvm_fault_upper_neighbor"); UVMHIST_CALLED(maphist);
/* locked: amap, anon */
-
+ KASSERT(pg->uobject == NULL);
+ KASSERT(pg->uanon != NULL);
+ KASSERT(mutex_owned(pg->uanon->an_lock));
+ KASSERT(uvm_pagegetdirty(pg) != UVM_PAGE_STATUS_CLEAN);
mutex_enter(&uvm_pageqlock);
uvm_pageenqueue(pg);
mutex_exit(&uvm_pageqlock);
@@ -1462,6 +1465,7 @@ uvm_fault_upper_enter(
KASSERT(anon->an_lock == amap->am_lock);
KASSERT(oanon->an_lock == amap->am_lock);
KASSERT(uobj == NULL || mutex_owned(uobj->vmobjlock));
+ KASSERT(uvm_pagegetdirty(pg) != UVM_PAGE_STATUS_CLEAN);
/*
* now map the page in.
