Author: rmacklem
Date: Fri Jul 21 00:14:43 2017
New Revision: 321314
URL: https://svnweb.freebsd.org/changeset/base/321314
Log:
r320062 introduced a bug when doing NFSv4.1 mounts against some non-FreeBSD
servers.
r320062 used nm_rsize, nm_wsize to set the maximum request/response sizes for
the NFSv4.1 session. If rsize,wsize are not specified as options, the
value of nm_rsize, nm_wsize is 0 at session creation, resulting in
values for request/response that are too small.
This patch fixes the problem. A workaround is to specify rsize=N,wsize=N
mount options explicitly, so they are set before session creation.
This bug only affects NFSv4.1 mounts against some non-FreeBSD servers.
MFC after: 1 week
Modified:
head/sys/fs/nfsclient/nfs_clrpcops.c
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c Thu Jul 20 23:59:47 2017
(r321313)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c Fri Jul 21 00:14:43 2017
(r321314)
@@ -4674,6 +4674,11 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsc
struct nfsrv_descript *nd = &nfsd;
int error, irdcnt;
+ /* Make sure nm_rsize, nm_wsize is set. */
+ if (nmp->nm_rsize > NFS_MAXBSIZE || nmp->nm_rsize == 0)
+ nmp->nm_rsize = NFS_MAXBSIZE;
+ if (nmp->nm_wsize > NFS_MAXBSIZE || nmp->nm_wsize == 0)
+ nmp->nm_wsize = NFS_MAXBSIZE;
nfscl_reqstart(nd, NFSPROC_CREATESESSION, nmp, NULL, 0, NULL, NULL);
NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED);
*tl++ = sep->nfsess_clientid.lval[0];
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
