Commit 68bf05ef authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust

nfs41: fix session fore channel negotiation

If the rsize or wsize is not set on the mount command, negotiate the highest
supported rsize and wsize in session creation.

Fixes a bug where the client negotiated nfs41_maxwrite_overhead as
ca_maxrequestsize and nfs41_maxread_overhead as ca_maxresponsesize resulting
in NFS4ERR_REQ_TOO_BIG errors on writes.
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a5523b84
...@@ -4935,14 +4935,22 @@ int nfs4_init_session(struct nfs_server *server) ...@@ -4935,14 +4935,22 @@ int nfs4_init_session(struct nfs_server *server)
{ {
struct nfs_client *clp = server->nfs_client; struct nfs_client *clp = server->nfs_client;
struct nfs4_session *session; struct nfs4_session *session;
unsigned int rsize, wsize;
int ret; int ret;
if (!nfs4_has_session(clp)) if (!nfs4_has_session(clp))
return 0; return 0;
rsize = server->rsize;
if (rsize == 0)
rsize = NFS_MAX_FILE_IO_SIZE;
wsize = server->wsize;
if (wsize == 0)
wsize = NFS_MAX_FILE_IO_SIZE;
session = clp->cl_session; session = clp->cl_session;
session->fc_attrs.max_rqst_sz = server->wsize + nfs41_maxwrite_overhead; session->fc_attrs.max_rqst_sz = wsize + nfs41_maxwrite_overhead;
session->fc_attrs.max_resp_sz = server->rsize + nfs41_maxread_overhead; session->fc_attrs.max_resp_sz = rsize + nfs41_maxread_overhead;
ret = nfs4_recover_expired_lease(server); ret = nfs4_recover_expired_lease(server);
if (!ret) if (!ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment