diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2015-05-14 22:50:07 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2015-05-14 22:50:07 +0000 |
| commit | ad5b8ec6b444821c0dce4a3e0a73d8179d1dd4e1 (patch) | |
| tree | ff92e857839a20a5def9e2ed0b79962fc1029aa5 /sys/fs | |
| parent | b07f4ac2f0b035d9617f6097c18d4932104b0d5d (diff) | |
| download | FreeBSD-src-ad5b8ec6b444821c0dce4a3e0a73d8179d1dd4e1.zip FreeBSD-src-ad5b8ec6b444821c0dce4a3e0a73d8179d1dd4e1.tar.gz | |
MFC: r281960
MAXBSIZE defines both the largest UFS block size and the
largest size for a buffer in the buffer cache. This patch
defines a new constant MAXBCACHEBUF, which is the largest
size for a buffer in the buffer cache. Having a separate
constant allows MAXBCACHEBUF to be set larger than MAXBSIZE
on a per-architecture basis, so that NFS can do larger read/writes
for these architectures. It modifies sys/param.h so that BKVASIZE
can also be set on a per-architecture basis.
A couple of cases where NFS used MAXBSIZE instead of NFS_MAXBSIZE
is fixed as well.
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/nfs/nfsport.h | 2 | ||||
| -rw-r--r-- | sys/fs/nfsclient/nfs_clvfsops.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 557db11..b46aef7 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -967,7 +967,7 @@ struct nfsreq { }; #ifndef NFS_MAXBSIZE -#define NFS_MAXBSIZE MAXBSIZE +#define NFS_MAXBSIZE MAXBCACHEBUF #endif /* diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 36f02f0..fba565e 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -196,16 +196,16 @@ newnfs_iosize(struct nfsmount *nmp) } if (nmp->nm_rsize > maxio || nmp->nm_rsize == 0) nmp->nm_rsize = maxio; - if (nmp->nm_rsize > MAXBSIZE) - nmp->nm_rsize = MAXBSIZE; + if (nmp->nm_rsize > NFS_MAXBSIZE) + nmp->nm_rsize = NFS_MAXBSIZE; if (nmp->nm_readdirsize > maxio || nmp->nm_readdirsize == 0) nmp->nm_readdirsize = maxio; if (nmp->nm_readdirsize > nmp->nm_rsize) nmp->nm_readdirsize = nmp->nm_rsize; if (nmp->nm_wsize > maxio || nmp->nm_wsize == 0) nmp->nm_wsize = maxio; - if (nmp->nm_wsize > MAXBSIZE) - nmp->nm_wsize = MAXBSIZE; + if (nmp->nm_wsize > NFS_MAXBSIZE) + nmp->nm_wsize = NFS_MAXBSIZE; /* * Calculate the size used for io buffers. Use the larger |
