[src/netbsd-1-5]: src/sys/ufs/ffs Pull up revision 1.6 (requested by fvdl):

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

details:   https://anonhg.NetBSD.org/src/rev/0b6b72e54a04
branches:  netbsd-1-5
changeset: 490332:0b6b72e54a04
user:      he <he%NetBSD.org@localhost>
date:      Thu Dec 14 23:36:40 2000 +0000

description:
Pull up revision 1.6 (requested by fvdl):
  Improve NFS performance, possibly with as much as 100% in
  throughput.  Please note: this implies a kernel interface change,
  VOP_FSYNC gains two arguments.

diffstat:

 sys/ufs/ffs/ffs_softdep.c |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 59e409a1c504 -r 0b6b72e54a04 sys/ufs/ffs/ffs_softdep.c
--- a/sys/ufs/ffs/ffs_softdep.c Thu Dec 14 23:36:36 2000 +0000
+++ b/sys/ufs/ffs/ffs_softdep.c Thu Dec 14 23:36:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_softdep.c,v 1.2.2.4 2000/08/17 18:50:53 fvdl Exp $ */
+/*     $NetBSD: ffs_softdep.c,v 1.2.2.5 2000/12/14 23:36:40 he Exp $   */
 
 /*
  * Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
@@ -636,7 +636,7 @@
                                break;
                }
                vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
-               error = VOP_FSYNC(devvp, p->p_ucred, FSYNC_WAIT, p);
+               error = VOP_FSYNC(devvp, p->p_ucred, FSYNC_WAIT, 0, 0, p);
                VOP_UNLOCK(devvp, 0);
                if (error)
                        break;
@@ -3869,6 +3869,8 @@
                struct vnode *a_vp;
                struct ucred *a_cred;
                int a_waitfor;
+               off_t offhi;
+               off_t offlo;
                struct proc *a_p;
        } */ *ap = v;
        struct vnode *vp = ap->a_vp;
@@ -4279,8 +4281,8 @@
                        ipflag = vn_setrecurse(pvp);    /* XXX */
                        if ((error = VFS_VGET(mp, inum, &vp)) != 0)
                                break;
-                       if ((error = VOP_FSYNC(vp, p->p_ucred, 0, p)) ||
-                           (error = VOP_FSYNC(vp, p->p_ucred, 0, p))) {
+                       if ((error = VOP_FSYNC(vp, p->p_ucred, 0, 0, 0, p)) ||
+                           (error = VOP_FSYNC(vp, p->p_ucred, 0, 0, 0, p))) {
                                vput(vp);
                                break;
                        }
@@ -4470,7 +4472,7 @@
                                softdep_error("clear_remove: vget", error);
                                return;
                        }
-                       if ((error = VOP_FSYNC(vp, p->p_ucred, 0, p)))
+                       if ((error = VOP_FSYNC(vp, p->p_ucred, 0, 0, 0, p)))
                                softdep_error("clear_remove: fsync", error);
                        drain_output(vp, 0);
                        vput(vp);
@@ -4539,10 +4541,11 @@
                        return;
                }
                if (ino == lastino) {
-                       if ((error = VOP_FSYNC(vp, p->p_ucred, FSYNC_WAIT, p)))
+                       if ((error = VOP_FSYNC(vp, p->p_ucred, FSYNC_WAIT,
+                                   0, 0, p)))
                                softdep_error("clear_inodedeps: fsync1", error);
                } else {
-                       if ((error = VOP_FSYNC(vp, p->p_ucred, 0, p)))
+                       if ((error = VOP_FSYNC(vp, p->p_ucred, 0, 0, 0, p)))
                                softdep_error("clear_inodedeps: fsync2", error);
                        drain_output(vp, 0);
                }