Module Name: src
Committed By: mlelstv
Date: Sun Feb 21 13:55:58 UTC 2010
Modified Files:
src/sys/ufs/ffs: ffs_alloc.c
Log Message:
For the UVM_PAGE_TRKOWN test do not require that the relevant pages
must exist.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/ufs/ffs/ffs_alloc.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/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.124 src/sys/ufs/ffs/ffs_alloc.c:1.125
--- src/sys/ufs/ffs/ffs_alloc.c:1.124 Thu May 7 19:26:09 2009
+++ src/sys/ufs/ffs/ffs_alloc.c Sun Feb 21 13:55:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.124 2009/05/07 19:26:09 elad Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.125 2010/02/21 13:55:58 mlelstv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.124 2009/05/07 19:26:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.125 2010/02/21 13:55:58 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -194,8 +194,7 @@
mutex_enter(&uobj->vmobjlock);
while (off < endoff) {
pg = uvm_pagelookup(uobj, off);
- KASSERT(pg != NULL);
- KASSERT(pg->owner == curproc->p_pid);
+ KASSERT(pg == NULL || pg->owner == curproc->p_pid);
off += PAGE_SIZE;
}
mutex_exit(&uobj->vmobjlock);
@@ -302,8 +301,7 @@
mutex_enter(&uobj->vmobjlock);
while (off < endoff) {
pg = uvm_pagelookup(uobj, off);
- KASSERT(pg != NULL);
- KASSERT(pg->owner == curproc->p_pid);
+ KASSERT(pg == NULL || pg->owner == curproc->p_pid);
KASSERT((pg->flags & PG_CLEAN) == 0);
off += PAGE_SIZE;
}
