diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2005-04-01 02:54:58 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2005-04-01 02:54:58 +0000 |
| commit | 8dfe0de6dded7f932b06d8091e190e80ed1b5176 (patch) | |
| tree | 2e6b430c8e9cc01239604cabaea4be9e87afc640 | |
| parent | 6424c22051b6f810c5dc80f321724f94280910ec (diff) | |
at long last, disable write gathering for v3. ok like everyone
| -rw-r--r-- | sys/nfs/nfs_syscalls.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index db3d69bc958..7bf17ef9d96 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_syscalls.c,v 1.43 2004/12/26 21:22:14 miod Exp $ */ +/* $OpenBSD: nfs_syscalls.c,v 1.44 2005/04/01 02:54:57 tedu Exp $ */ /* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */ /* @@ -644,13 +644,14 @@ nfssvc_nfsd(nsd, argp, p) do { switch (cacherep) { case RC_DOIT: - if (writes_todo || (nd->nd_procnum == NFSPROC_WRITE && + if (writes_todo || (!(nd->nd_flag & ND_NFSV3) && + nd->nd_procnum == NFSPROC_WRITE && nfsrvw_procrastinate > 0)) - error = nfsrv_writegather(&nd, slp, - nfsd->nfsd_procp, &mreq); + error = nfsrv_writegather(&nd, slp, + nfsd->nfsd_procp, &mreq); else - error = (*(nfsrv3_procs[nd->nd_procnum]))(nd, - slp, nfsd->nfsd_procp, &mreq); + error = (*(nfsrv3_procs[nd->nd_procnum]))(nd, + slp, nfsd->nfsd_procp, &mreq); if (mreq == NULL) break; if (error) { |