svn commit: r321632 - stable/11/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Thu Jul 27 23:09:12 2017
New Revision: 321632
URL: https://svnweb.freebsd.org/changeset/base/321632

Log:
  MFC: r321314
  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.

Modified:
  stable/11/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- stable/11/sys/fs/nfsclient/nfs_clrpcops.c	Thu Jul 27 23:01:07 2017	(r321631)
+++ stable/11/sys/fs/nfsclient/nfs_clrpcops.c	Thu Jul 27 23:09:12 2017	(r321632)
@@ -4664,6 +4664,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];