diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-13 13:56:27 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-13 13:56:27 -0500 |
| commit | 52c9948b1fd80381ba5a9a87dcc4fbe3cf4979b8 (patch) | |
| tree | 7bca6a20560f428442f18450df0948774f982df0 /fs/nfs/client.c | |
| parent | f40542532e96dda5506eb76badea322f2ae4731c (diff) | |
| parent | 190f38e5cedc910940b1da9015f00458c18f97b4 (diff) | |
| download | kernel_replicant_linux-52c9948b1fd80381ba5a9a87dcc4fbe3cf4979b8.tar.gz kernel_replicant_linux-52c9948b1fd80381ba5a9a87dcc4fbe3cf4979b8.tar.bz2 kernel_replicant_linux-52c9948b1fd80381ba5a9a87dcc4fbe3cf4979b8.zip | |
Merge branch 'nfs-for-2.6.33'
Diffstat (limited to 'fs/nfs/client.c')
| -rw-r--r-- | fs/nfs/client.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 99ea196f071f..ee77713ce68b 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1260,10 +1260,20 @@ error: static void nfs4_session_set_rwsize(struct nfs_server *server) { #ifdef CONFIG_NFS_V4_1 + struct nfs4_session *sess; + u32 server_resp_sz; + u32 server_rqst_sz; + if (!nfs4_has_session(server->nfs_client)) return; - server->rsize = server->nfs_client->cl_session->fc_attrs.max_resp_sz; - server->wsize = server->nfs_client->cl_session->fc_attrs.max_rqst_sz; + sess = server->nfs_client->cl_session; + server_resp_sz = sess->fc_attrs.max_resp_sz - nfs41_maxread_overhead; + server_rqst_sz = sess->fc_attrs.max_rqst_sz - nfs41_maxwrite_overhead; + + if (server->rsize > server_resp_sz) + server->rsize = server_resp_sz; + if (server->wsize > server_rqst_sz) + server->wsize = server_rqst_sz; #endif /* CONFIG_NFS_V4_1 */ } |