[src/netbsd-1-5]: src/sys/ufs/lfs Pullup 1.46 [perseant, toshii]:

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

details:   https://anonhg.NetBSD.org/src/rev/a89719572951
branches:  netbsd-1-5
changeset: 490069:a89719572951
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 01 03:57:18 2000 +0000

description:
Pullup 1.46 [perseant, toshii]:
In lfs_truncate, don't overcount the real blocks removed from the inode,
when deallocating a fragment that has not made it to disk yet.

Also, during dirops, give the directory vnode an extra reference in
SET_DIROP, to ensure its continued existence during SET_ENDOP, preventing
a possible NULL-dereference there.

These two changes should close PR #11064.

diffstat:

 sys/ufs/lfs/lfs_vnops.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 5d0eaa5dd79a -r a89719572951 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Wed Nov 01 03:56:53 2000 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Wed Nov 01 03:57:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.38.2.2 2000/09/14 18:50:20 perseant Exp $      */
+/*     $NetBSD: lfs_vnops.c,v 1.38.2.3 2000/11/01 03:57:18 tv Exp $    */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -284,6 +284,8 @@
                struct vnode *a_vp;
                struct ucred *a_cred;
                int a_flags;
+               off_t offlo;
+               off_t offhi;
                struct proc *a_p;
        } */ *ap = v;
        
@@ -489,7 +491,7 @@
         * return.  But, that leaves this vnode in limbo, also not good.
         * Can this ever happen (barring hardware failure)?
         */
-       if ((error = VOP_FSYNC(*vpp, NOCRED, FSYNC_WAIT, curproc)) != 0) {
+       if ((error = VOP_FSYNC(*vpp, NOCRED, FSYNC_WAIT, 0, 0, curproc)) != 0) {
                printf("Couldn't fsync in mknod (ino %d)---what do I do?\n",
                       VTOI(*vpp)->i_number);
                return (error);