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_balloc.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_balloc.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.23 retrieving revision 1.23.2.2 diff -u -p -r1.23 -r1.23.2.2 --- src/sys/ufs/ffs/ffs_balloc.c 2000/11/27 08:39:54 1.23 +++ src/sys/ufs/ffs/ffs_balloc.c 2001/06/21 20:10:05 1.23.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_balloc.c,v 1.23 2000/11/27 08:39:54 chs Exp $ */ +/* $NetBSD: ffs_balloc.c,v 1.23.2.2 2001/06/21 20:10:05 nathanw Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -35,13 +35,14 @@ * @(#)ffs_balloc.c 8.8 (Berkeley) 6/16/95 */ -#if defined(_KERNEL) && !defined(_LKM) +#if defined(_KERNEL_OPT) #include "opt_quota.h" #endif #include #include #include +#include #include #include #include @@ -414,7 +415,7 @@ fail: * occurence. The error return from fsync is ignored as we already * have an error to return to the user. */ - (void) VOP_FSYNC(vp, cred, FSYNC_WAIT, 0, 0, curproc); + (void) VOP_FSYNC(vp, cred, FSYNC_WAIT, 0, 0, curproc->l_proc); for (deallocated = 0, blkp = allociblk; blkp < allocblk; blkp++) { ffs_blkfree(ip, *blkp, fs->fs_bsize); deallocated += fs->fs_bsize; @@ -456,7 +457,7 @@ fail: ip->i_ffs_blocks -= btodb(deallocated); ip->i_flag |= IN_CHANGE | IN_UPDATE; } - (void) VOP_FSYNC(vp, cred, FSYNC_WAIT, 0, 0, curproc); + (void) VOP_FSYNC(vp, cred, FSYNC_WAIT, 0, 0, curproc->l_proc); return (error); }