Module Name: src
Committed By: uebayasi
Date: Sun Nov 21 18:22:33 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Clarify things a bit in XIP putpages.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.63 -r1.36.2.64 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.63 src/sys/miscfs/genfs/genfs_io.c:1.36.2.64
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.63 Sun Nov 21 17:07:38 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sun Nov 21 18:22:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.63 2010/11/21 17:07:38 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.64 2010/11/21 18:22:32 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.63 2010/11/21 17:07:38 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.64 2010/11/21 18:22:32 uebayasi Exp $");
#include "opt_xip.h"
@@ -1532,16 +1532,10 @@
mutex_enter(&uobj->vmobjlock);
for (i = 0; i < npages; i++) {
pg = pgs[i];
- if (pg == NULL || pg == PGO_DONTCARE)
- continue;
+ KASSERT(pg != NULL && pg != PGO_DONTCARE);
if (pg == PGO_HOLE) {
pg = uvm_page_holepage;
KASSERT(pg != NULL);
- /*
- * XXXUEBS
- * Invalidating hole pages may be unnecessary,
- * but just for safety.
- */
} else {
/*
* Freeing normal XIP pages; nothing to do.
