Module Name: src
Committed By: mlelstv
Date: Mon Feb 8 00:01:39 UTC 2010
Modified Files:
src/sys/uvm: uvm_fault.c
Log Message:
Move assertion to make check more clear.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 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.164 src/sys/uvm/uvm_fault.c:1.165
--- src/sys/uvm/uvm_fault.c:1.164 Sun Feb 7 23:25:07 2010
+++ src/sys/uvm/uvm_fault.c Mon Feb 8 00:01:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.164 2010/02/07 23:25:07 mlelstv Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.165 2010/02/08 00:01:39 mlelstv Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.164 2010/02/07 23:25:07 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.165 2010/02/08 00:01:39 mlelstv Exp $");
#include "opt_uvmhist.h"
@@ -1785,12 +1785,6 @@
0, flt->access_type & MASK(ufi->entry), ufi->entry->advice,
PGO_SYNCIO);
/* locked: pg(if no error) */
-#if 0
- KASSERT(error != 0 || (pg->flags & PG_BUSY) != 0);
-#else
- if (error == 0)
- KASSERT((pg->flags & PG_BUSY) != 0);
-#endif
/*
* recover from I/O
@@ -1819,6 +1813,8 @@
/* locked: pg */
+ KASSERT((pg->flags & PG_BUSY) != 0);
+
mutex_enter(&uvm_pageqlock);
uvm_pageactivate(pg);
mutex_exit(&uvm_pageqlock);
