diff options
| author | Olga Kornievskaia <kolga@netapp.com> | 2017-03-08 14:39:15 -0500 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-01-17 12:55:36 -0500 |
| commit | 265926de6f07bcc02059f03bfc57dd1fda13b032 (patch) | |
| tree | 572ef554a05d7f1bb9627127f39b76d32022fe81 /fs | |
| parent | c7da20b8ca027a7554224814e1f2d098d1268e3b (diff) | |
NFSv4.1 respect server's max size in CREATE_SESSION
[ Upstream commit 033853325fe3bdc70819a8b97915bd3bca41d3af ]
Currently client doesn't respect max sizes server returns in CREATE_SESSION.
nfs4_session_set_rwsize() gets called and server->rsize, server->wsize are 0
so they never get set to the sizes returned by the server.
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 5dea913baf46..a03ec3b53d9e 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -899,9 +899,9 @@ static void nfs4_session_set_rwsize(struct nfs_server *server) 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) + if (!server->rsize || server->rsize > server_resp_sz) server->rsize = server_resp_sz; - if (server->wsize > server_rqst_sz) + if (!server->wsize || server->wsize > server_rqst_sz) server->wsize = server_rqst_sz; #endif /* CONFIG_NFS_V4_1 */ } |