[src/netbsd-3]: src/sys/ufs/ufs Pull up following revision(s) (requested by y...

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

details:   https://anonhg.NetBSD.org/src/rev/f0db1a75a969
branches:  netbsd-3
changeset: 577298:f0db1a75a969
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Oct 04 22:05:12 2005 +0000

description:
Pull up following revision(s) (requested by yamt in ticket #848):
        sys/ufs/ufs/ufs_inode.c: revision 1.53
ufs_balloc_range: correct range to clear PG_RDONLY.
fix a panic in ubc_fault.

diffstat:

 sys/ufs/ufs/ufs_inode.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 53e40dab2eee -r f0db1a75a969 sys/ufs/ufs/ufs_inode.c
--- a/sys/ufs/ufs/ufs_inode.c   Tue Oct 04 21:58:35 2005 +0000
+++ b/sys/ufs/ufs/ufs_inode.c   Tue Oct 04 22:05:12 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_inode.c,v 1.47.6.1 2005/08/24 18:43:38 riz Exp $   */
+/*     $NetBSD: ufs_inode.c,v 1.47.6.2 2005/10/04 22:05:12 tron Exp $  */
 
 /*
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.47.6.1 2005/08/24 18:43:38 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.47.6.2 2005/10/04 22:05:12 tron Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -198,6 +198,7 @@
        int flags;
 {
        off_t oldeof, neweof, oldeob, oldeop, neweob, pagestart;
+       off_t eob;
        struct uvm_object *uobj;
        struct genfs_node *gp = VTOG(vp);
        int i, delta, error, npages;
@@ -277,12 +278,13 @@
         * (since they now have backing store) and unbusy them.
         */
 
+       GOP_SIZE(vp, off + len, &eob, GOP_SIZE_WRITE);
        simple_lock(&uobj->vmobjlock);
        for (i = 0; i < npages; i++) {
                if (error) {
                        pgs[i]->flags |= PG_RELEASED;
                } else if (off <= pagestart + (i << PAGE_SHIFT) &&
-                   pagestart + ((i + 1) << PAGE_SHIFT) <= off + len) {
+                   pagestart + ((i + 1) << PAGE_SHIFT) <= eob) {
                        pgs[i]->flags &= ~PG_RDONLY;
                }
        }