diff options
| author | Olga Kornievskaia <kolga@netapp.com> | 2017-03-08 14:39:15 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-20 10:01:31 +0100 |
| commit | 7480adadb8ba2bc82af61fc4f1fe0a91ed5c8331 (patch) | |
| tree | 3ba0ac98cb6bb3966a20b34d98e5a583756f2660 /fs | |
| parent | 1062f3998ecba87df9211e6bcc0a16baf001a19a (diff) | |
| download | linux-stable-7480adadb8ba2bc82af61fc4f1fe0a91ed5c8331.tar.gz linux-stable-7480adadb8ba2bc82af61fc4f1fe0a91ed5c8331.tar.bz2 linux-stable-7480adadb8ba2bc82af61fc4f1fe0a91ed5c8331.zip | |
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@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 0e11fe80e5b9..723c656ebd28 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -894,9 +894,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 */ } |