From 8fd422dedef39f5475eaeb9eef019761a8d7eed8 Mon Sep 17 00:00:00 2001 From: fvdl Date: Tue, 19 Sep 2000 22:05:29 +0000 Subject: [PATCH] Adapt for VOP_FSYNC parameter change. --- sys/nfs/nfs_nqlease.c | 4 ++-- sys/nfs/nfs_serv.c | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index d658f56cfebb..7c09d12cf76b 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_nqlease.c,v 1.32 2000/06/09 00:00:17 fvdl Exp $ */ +/* $NetBSD: nfs_nqlease.c,v 1.33 2000/09/19 22:05:29 fvdl Exp $ */ /* * Copyright (c) 1992, 1993 @@ -1077,7 +1077,7 @@ nqnfs_clientd(nmp, cred, ncd, flag, argp, p) (void) nqnfs_vacated(vp, cred); } else if (vp->v_type == VREG) { (void) VOP_FSYNC(vp, cred, - FSYNC_WAIT, p); + FSYNC_WAIT, 0, 0, p); np->n_flag &= ~NMODIFIED; } } diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index ef6c9057b591..cf38aa33b342 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_serv.c,v 1.57 2000/08/03 20:41:31 thorpej Exp $ */ +/* $NetBSD: nfs_serv.c,v 1.58 2000/09/19 22:05:29 fvdl Exp $ */ /* * Copyright (c) 1989, 1993 @@ -3056,10 +3056,6 @@ nfsrv_commit(nfsd, slp, procp, mrq) nfsm_srvmtofh(fhp); nfsm_dissect(tl, u_int32_t *, 3 * NFSX_UNSIGNED); - /* - * XXX At this time VOP_FSYNC() does not accept offset and byte - * count parameters, so these arguments are useless (someday maybe). - */ off = fxdr_hyper(tl); tl += 2; cnt = fxdr_unsigned(int, *tl); @@ -3071,7 +3067,7 @@ nfsrv_commit(nfsd, slp, procp, mrq) return (0); } for_ret = VOP_GETATTR(vp, &bfor, cred, procp); - error = VOP_FSYNC(vp, cred, FSYNC_WAIT, procp); + error = VOP_FSYNC(vp, cred, FSYNC_WAIT, off, off + cnt, procp); aft_ret = VOP_GETATTR(vp, &aft, cred, procp); vput(vp); nfsm_reply(NFSX_V3WCCDATA + NFSX_V3WRITEVERF);