Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/ufs/ufs/ufs_inode.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ufs/ufs_inode.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.88 retrieving revision 1.88.2.3 diff -u -p -r1.88 -r1.88.2.3 --- src/sys/ufs/ufs/ufs_inode.c 2011/09/20 14:01:33 1.88 +++ src/sys/ufs/ufs/ufs_inode.c 2013/01/23 00:06:35 1.88.2.3 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_inode.c,v 1.88 2011/09/20 14:01:33 chs Exp $ */ +/* $NetBSD: ufs_inode.c,v 1.88.2.3 2013/01/23 00:06:35 yamt Exp $ */ /* * Copyright (c) 1991, 1993 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.88 2011/09/20 14:01:33 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.88.2.3 2013/01/23 00:06:35 yamt Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -114,7 +114,7 @@ ufs_inactive(void *v) if (vp->v_mount->mnt_wapbl) { uint64_t incr = MNINDIR(ip->i_ump) << vp->v_mount->mnt_fs_bshift; /* Power of 2 */ - uint64_t base = NDADDR << + uint64_t base = UFS_NDADDR << vp->v_mount->mnt_fs_bshift; while (!error && ip->i_size > base + incr) { /* @@ -278,7 +278,7 @@ ufs_balloc_range(struct vnode *vp, off_t genfs_node_unlock(vp); /* - * if the allocation succeeded, clear PG_CLEAN on all the pages + * if the allocation succeeded, mark all the pages dirty * and clear PG_RDONLY on any pages that are now fully backed * by disk blocks. if the allocation failed, we do not invalidate * the pages since they might have already existed and been dirty, @@ -297,7 +297,7 @@ ufs_balloc_range(struct vnode *vp, off_t pagestart + ((i + 1) << PAGE_SHIFT) <= eob) { pgs[i]->flags &= ~PG_RDONLY; } - pgs[i]->flags &= ~PG_CLEAN; + uvm_pagemarkdirty(pgs[i], UVM_PAGE_STATUS_DIRTY); } uvm_pageactivate(pgs[i]); }