From d2f3b5f4423ff5f29e7d674eb8ae8c0ab57b778e Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Tue, 15 Dec 2009 12:55:02 -0500 Subject: [PATCH] --- yaml --- r: 177239 b: refs/heads/master c: 68bf05efb7facbcf4a7b8d6b48a0800a90895511 h: refs/heads/master i: 177237: 630ab2cade148f7777272d51115b8dbe49ce3dc3 177235: aa73d48b4dcb8ee4ad0565db046f54a58a7199c3 177231: 9877e49772ff42e7890bfbb5396ee2d320c2e815 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4proc.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e586ef2d0c34..e3ddd7b998e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5523b84c40d34d2c30b45096fbb099b98e4b5a3 +refs/heads/master: 68bf05efb7facbcf4a7b8d6b48a0800a90895511 diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index bd4555fbdf25..019a009e73a0 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -4935,14 +4935,22 @@ int nfs4_init_session(struct nfs_server *server) { struct nfs_client *clp = server->nfs_client; struct nfs4_session *session; + unsigned int rsize, wsize; int ret; if (!nfs4_has_session(clp)) 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->fc_attrs.max_rqst_sz = server->wsize + nfs41_maxwrite_overhead; - session->fc_attrs.max_resp_sz = server->rsize + nfs41_maxread_overhead; + session->fc_attrs.max_rqst_sz = wsize + nfs41_maxwrite_overhead; + session->fc_attrs.max_resp_sz = rsize + nfs41_maxread_overhead; ret = nfs4_recover_expired_lease(server); if (!ret)