mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
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: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
b15c7cdde4
commit
be824167e3
1 changed files with 5 additions and 7 deletions
|
@ -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)
|
||||
{
|
||||
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 {
|
||||
|
@ -7572,13 +7575,8 @@ static int nfs4_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred)
|
|||
goto out;
|
||||
}
|
||||
ret = rpc_wait_for_completion_task(task);
|
||||
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);
|
||||
if (!ret)
|
||||
ret = task->tk_status;
|
||||
}
|
||||
rpc_put_task(task);
|
||||
out:
|
||||
dprintk("<-- %s status=%d\n", __func__, ret);
|
||||
|
|
Loading…
Reference in a new issue