[src/uebayasi-xip]: src/sys/miscfs/genfs In XIP vnode pager, assert that file...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab4ddd59357f
branches:  uebayasi-xip
changeset: 751763:ab4ddd59357f
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Wed Aug 11 13:33:03 2010 +0000

description:
In XIP vnode pager, assert that filesystem blocks and pages are aligned.

diffstat:

 sys/miscfs/genfs/genfs_io.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 1e1b9a8c4a88 -r ab4ddd59357f sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Wed Aug 11 13:30:50 2010 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Wed Aug 11 13:33:03 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfs_io.c,v 1.36.2.18 2010/07/22 07:49:46 uebayasi Exp $      */
+/*     $NetBSD: genfs_io.c,v 1.36.2.19 2010/08/11 13:33:03 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.18 2010/07/22 07:49:46 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.19 2010/08/11 13:33:03 uebayasi Exp $");
 
 #include "opt_xip.h"
 
@@ -846,6 +846,7 @@
                        KASSERT(seg != NULL);
                        /* bus_space_mmap cookie -> paddr_t */
                        seg_off = (blkno << dev_bshift) + (off - (lbn << fs_bshift));
+                       KASSERT((seg_off & PAGE_MASK) == 0);
                        pg = seg->pgs + (seg_off >> PAGE_SHIFT);
                        KASSERT(pg->phys_addr == pmap_phys_address(seg->start) + seg_off);