From: Jeff Layton <jlay...@redhat.com> ...otherwise the logic in the timeout handling doesn't work correctly.
Spotted-by: Trond Myklebust <trond.mykleb...@primarydata.com> Cc: stable@vger.kernel.org Signed-off-by: Jeff Layton <jlay...@redhat.com> Signed-off-by: J. Bruce Fields <bfie...@redhat.com> Signed-off-by: Jeff Layton <jlay...@primarydata.com> --- fs/nfsd/nfs4callback.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index cd3f05de0e0e..329dca4ba0d5 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -768,9 +768,11 @@ static struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc 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, -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html