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/ffs/ffs_inode.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_inode.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.105.2.1 retrieving revision 1.106 diff -u -p -r1.105.2.1 -r1.106 --- src/sys/ufs/ffs/ffs_inode.c 2011/06/23 14:20:30 1.105.2.1 +++ src/sys/ufs/ffs/ffs_inode.c 2011/06/12 03:36:00 1.106 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_inode.c,v 1.105.2.1 2011/06/23 14:20:30 cherry Exp $ */ +/* $NetBSD: ffs_inode.c,v 1.106 2011/06/12 03:36:00 rmind Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.105.2.1 2011/06/23 14:20:30 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.106 2011/06/12 03:36:00 rmind Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -321,8 +321,7 @@ ffs_truncate(struct vnode *ovp, off_t le size = blksize(fs, oip, lbn); eoz = MIN(MAX(lblktosize(fs, lbn) + size, round_page(pgoffset)), osize); - ubc_zerorange(&ovp->v_uobj, length, eoz - length, - UBC_UNMAP_FLAG(ovp)); + uvm_vnp_zerorange(ovp, length, eoz - length); if (round_page(eoz) > round_page(length)) { mutex_enter(ovp->v_interlock); error = VOP_PUTPAGES(ovp, round_page(length),