diff options
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs.h | 1 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index 573a0e24a15c..c7fd08538069 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -329,6 +329,7 @@ int nfs_connect(struct nfsmount *, struct nfsreq *); void nfs_disconnect(struct nfsmount *); void nfs_safedisconnect(struct nfsmount *); int nfs_getattrcache(struct vnode *, struct vattr *); +int nfs_iosize(struct nfsmount *nmp); int nfsm_strtmbuf(struct mbuf **, char **, const char *, long); int nfs_bioread(struct vnode *, struct uio *, int, struct ucred *); int nfsm_uiotombuf(struct uio *, struct mbuf **, int, caddr_t *); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 653c946743a6..e1055eab2eeb 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -105,8 +105,8 @@ static int nfs_tprintf_delay = NFS_TPRINTF_DELAY; SYSCTL_INT(_vfs_nfs, NFS_TPRINTF_DELAY, downdelayinterval, CTLFLAG_RW, &nfs_tprintf_delay, 0, ""); -static int nfs_iosize(struct nfsmount *nmp); -static void nfs_decode_args(struct mount *mp, struct nfsmount *nmp, struct nfs_args *argp); +static void nfs_decode_args(struct mount *mp, struct nfsmount *nmp, + struct nfs_args *argp); static int mountnfs(struct nfs_args *, struct mount *, struct sockaddr *, char *, struct vnode **, struct ucred *cred); @@ -174,7 +174,7 @@ static void nfs_convert_diskless(void); static void nfs_convert_oargs(struct nfs_args *args, struct onfs_args *oargs); -static int +int nfs_iosize(struct nfsmount *nmp) { int iosize; @@ -185,10 +185,9 @@ nfs_iosize(struct nfsmount *nmp) * that it is at least one VM page to avoid wasting buffer * space. */ - iosize = max(nmp->nm_rsize, nmp->nm_wsize); - if (iosize < PAGE_SIZE) - iosize = PAGE_SIZE; - return iosize; + iosize = imax(nmp->nm_rsize, nmp->nm_wsize); + iosize = imax(iosize, PAGE_SIZE); + return (iosize); } static void |