Module Name: src
Committed By: uebayasi
Date: Sat Nov 20 08:03:22 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
genfs_do_getpages_xip_io_done: Adjust page condition checks:
- Expect uvn_findpage_xip() returns busy pages.
- Device pages are always initialized (== !uninitialized == !fake).
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.51 -r1.36.2.52 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.51 src/sys/miscfs/genfs/genfs_io.c:1.36.2.52
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.51 Sat Nov 20 07:47:34 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sat Nov 20 08:03:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.51 2010/11/20 07:47:34 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.52 2010/11/20 08:03:22 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.51 2010/11/20 07:47:34 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.52 2010/11/20 08:03:22 uebayasi Exp $");
#include "opt_xip.h"
@@ -1112,11 +1112,10 @@
struct vm_page *pg = pps[i];
KASSERT((pg->flags & PG_RDONLY) != 0);
- KASSERT((pg->flags & PG_BUSY) == 0);
+ KASSERT((pg->flags & PG_BUSY) != 0);
KASSERT((pg->flags & PG_CLEAN) != 0);
KASSERT((pg->flags & PG_DEVICE) != 0);
- pg->flags |= PG_BUSY;
- pg->flags &= ~PG_FAKE;
+ KASSERT((pg->flags & PG_FAKE) == 0);
pg->uobject = &vp->v_uobj;
}
