diff options
| author | delphij <delphij@FreeBSD.org> | 2005-03-26 11:29:02 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2005-03-26 11:29:02 +0000 |
| commit | e148e19ed6cd7d51169e61bab725b77128af9564 (patch) | |
| tree | 64bbfcbea31771668f8e33c448ca03b31c28b540 /sys/nfsserver | |
| parent | 660dab49e82be7f08e0be4728da611cf00c2a62b (diff) | |
| download | FreeBSD-src-e148e19ed6cd7d51169e61bab725b77128af9564.zip FreeBSD-src-e148e19ed6cd7d51169e61bab725b77128af9564.tar.gz | |
Do not do write gathering for NFSv3, since it makes no sense unless
the client is broken and does sync writes all the time.
Obtained from: NetBSD (sys/nfs/nfs_syscalls.c,v 1.44)
Reviewed by: -arch (bde)
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_syscalls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index b08d570..8b2f820 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -463,7 +463,8 @@ nfssvc_nfsd(struct thread *td) procrastinate = nfsrvw_procrastinate_v3; else procrastinate = nfsrvw_procrastinate; - if (writes_todo || (nd->nd_procnum == NFSPROC_WRITE && + if (writes_todo || (!(nd->nd_flag & ND_NFSV3) && + nd->nd_procnum == NFSPROC_WRITE && procrastinate > 0 && !notstarted)) error = nfsrv_writegather(&nd, slp, nfsd->nfsd_td, &mreq); |
