Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3758cf7e authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: set timeparms.to_maxval in setup_callback_client 



...otherwise the logic in the timeout handling doesn't work correctly.

Spotted-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4991a628

fs/nfsd/nfs4callback.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -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)

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 = {

	struct rpc_timeout	timeparms = {

		.to_initval	= max_cb_time(clp->net),

		.to_initval	= maxtime,

		.to_retries	= 0,

		.to_retries	= 0,

		.to_maxval	= maxtime,

	};

	};

	struct rpc_create_args args = {

	struct rpc_create_args args = {

		.net		= clp->net,

		.net		= clp->net,