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

Commit be824167 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Leases are renewed in sequence_done when we have sessions 



Ensure that the calls to renew_lease() in open_done() etc. only apply
to session-less versions of NFSv4.x (i.e. NFSv4.0).

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent b15c7cdd

fs/nfs/nfs4proc.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -467,7 +467,10 @@ static void do_renew_lease(struct nfs_client *clp, unsigned long timestamp) 




static void renew_lease(const struct nfs_server *server, unsigned long timestamp)

static void renew_lease(const struct nfs_server *server, unsigned long timestamp)

{

{

	do_renew_lease(server->nfs_client, timestamp);

	struct nfs_client *clp = server->nfs_client;



	if (!nfs4_has_session(clp))

		do_renew_lease(clp, timestamp);

}

}





struct nfs4_call_sync_data {

struct nfs4_call_sync_data {
@@ -7572,13 +7575,8 @@ static int nfs4_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred) 
		goto out;

		goto out;

	}

	}

	ret = rpc_wait_for_completion_task(task);

	ret = rpc_wait_for_completion_task(task);

	if (!ret) {

	if (!ret)

		struct nfs4_sequence_res *res = task->tk_msg.rpc_resp;



		if (task->tk_status == 0)

			nfs41_handle_sequence_flag_errors(clp, res->sr_status_flags);

		ret = task->tk_status;

		ret = task->tk_status;

	}

	rpc_put_task(task);

	rpc_put_task(task);

out:

out:

	dprintk("<-- %s status=%d\n", __func__, ret);

	dprintk("<-- %s status=%d\n", __func__, ret);