svn commit: r321313 - head/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Thu Jul 20 23:59:47 2017
New Revision: 321313
URL: https://svnweb.freebsd.org/changeset/base/321313

Log:
  Revert r321308. I'll commit a better fix soon.

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:57:01 2017	(r321312)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c	Thu Jul 20 23:59:47 2017	(r321313)
@@ -4672,14 +4672,8 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsc
 	uint32_t crflags, maxval, *tl;
 	struct nfsrv_descript nfsd;
 	struct nfsrv_descript *nd = &nfsd;
-	int error, irdcnt, rsiz, wsiz;
+	int error, irdcnt;
 
-	rsiz = nmp->nm_rsize;
-	if (rsiz == 0)
-		rsiz = NFS_MAXBSIZE;
-	wsiz = nmp->nm_wsize;
-	if (wsiz == 0)
-		wsiz = 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];
@@ -4693,8 +4687,8 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsc
 	/* Fill in fore channel attributes. */
 	NFSM_BUILD(tl, uint32_t *, 7 * NFSX_UNSIGNED);
 	*tl++ = 0;				/* Header pad size */
-	*tl++ = txdr_unsigned(wsiz + NFS_MAXXDR);/* Max request size */
-	*tl++ = txdr_unsigned(rsiz + NFS_MAXXDR);/* Max reply size */
+	*tl++ = txdr_unsigned(nmp->nm_wsize + NFS_MAXXDR);/* Max request size */
+	*tl++ = txdr_unsigned(nmp->nm_rsize + NFS_MAXXDR);/* Max reply size */
 	*tl++ = txdr_unsigned(4096);		/* Max response size cached */
 	*tl++ = txdr_unsigned(20);		/* Max operations */
 	*tl++ = txdr_unsigned(64);		/* Max slots */