diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:42 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:42 -0500 |
commit | e598d843c08a7ab6bdfa8098de49afb017fc6c6a (patch) | |
tree | 2e4862252744b4b8f0a9d43b371e0df6a1d3fcee /fs/nfs/nfs4proc.c | |
parent | b79a4a1b45b2543e38026303a1956bdc0aababa0 (diff) |
NFSv4: Remove redundant RENEW calls if we know the lease has expired
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 279ab36b5a67..780ba004b3dd 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -984,7 +984,8 @@ static int nfs4_recover_expired_lease(struct nfs_server *server) | |||
984 | ret = nfs4_wait_clnt_recover(server->client, clp); | 984 | ret = nfs4_wait_clnt_recover(server->client, clp); |
985 | if (ret != 0) | 985 | if (ret != 0) |
986 | return ret; | 986 | return ret; |
987 | if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) | 987 | if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) && |
988 | !test_bit(NFS4CLNT_CHECK_LEASE,&clp->cl_state)) | ||
988 | break; | 989 | break; |
989 | nfs4_schedule_state_recovery(clp); | 990 | nfs4_schedule_state_recovery(clp); |
990 | } | 991 | } |