summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:42 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:42 -0500
commite598d843c08a7ab6bdfa8098de49afb017fc6c6a (patch)
tree2e4862252744b4b8f0a9d43b371e0df6a1d3fcee /fs/nfs/nfs4proc.c
parentb79a4a1b45b2543e38026303a1956bdc0aababa0 (diff)
downloadop-kernel-dev-e598d843c08a7ab6bdfa8098de49afb017fc6c6a.zip
op-kernel-dev-e598d843c08a7ab6bdfa8098de49afb017fc6c6a.tar.gz
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 279ab36..780ba00 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)
ret = nfs4_wait_clnt_recover(server->client, clp);
if (ret != 0)
return ret;
- if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
+ if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&
+ !test_bit(NFS4CLNT_CHECK_LEASE,&clp->cl_state))
break;
nfs4_schedule_state_recovery(clp);
}
OpenPOWER on IntegriCloud