diff options
| author | Jeff Layton <jlayton@redhat.com> | 2014-04-15 08:51:48 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-04-18 14:34:31 +0200 |
| commit | 3758cf7e14b753838fe754ede3862af10b35fdac (patch) | |
| tree | bf6e59c6505fe4819bc6daaa9c357be6e6d4f5c9 /fs/nfsd | |
| parent | 4991a628a789dc5954e98e79476d9808812292ec (diff) | |
| download | op-kernel-dev-3758cf7e14b753838fe754ede3862af10b35fdac.zip op-kernel-dev-3758cf7e14b753838fe754ede3862af10b35fdac.tar.gz | |
nfsd: set timeparms.to_maxval in setup_callback_client
...otherwise the logic in the timeout handling doesn't work correctly.
Spotted-by: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 39c8ef8..2c73cae9 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -654,9 +654,11 @@ static struct rpc_clnt *create_backchannel_client(struct rpc_create_args *args) static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses) { + int maxtime = max_cb_time(clp->net); struct rpc_timeout timeparms = { - .to_initval = max_cb_time(clp->net), + .to_initval = maxtime, .to_retries = 0, + .to_maxval = maxtime, }; struct rpc_create_args args = { .net = clp->net, |
