From e6763033bfa1cca759ab40084eb8eadad0e48f1a Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Mon, 1 Oct 2012 20:42:32 -0400 Subject: [PATCH] --- yaml --- r: 333197 b: refs/heads/master c: 47b803c8d2e0545221397d175e3563f9f3695628 h: refs/heads/master i: 333195: 9ea48db429a95e34d397589e2e885b235b90af5e v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4state.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a06f3615db8f..71168d2384d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9d640f3a4f043f7dff66ad7bd8cb29ec145c41d +refs/heads/master: 47b803c8d2e0545221397d175e3563f9f3695628 diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c index 3da8130d4460..24a3ab492df2 100644 --- a/trunk/fs/nfs/nfs4state.c +++ b/trunk/fs/nfs/nfs4state.c @@ -1680,8 +1680,8 @@ static int nfs4_check_lease(struct nfs_client *clp) return nfs4_recovery_handle_error(clp, status); } -/* Set NFS4CLNT_LEASE_EXPIRED for all v4.0 errors and for recoverable errors - * on EXCHANGE_ID for v4.1 +/* Set NFS4CLNT_LEASE_EXPIRED and reclaim reboot state for all v4.0 errors + * and for recoverable errors on EXCHANGE_ID for v4.1 */ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) { @@ -1691,8 +1691,12 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) return -ESERVERFAULT; /* Lease confirmation error: retry after purging the lease */ ssleep(1); + clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); + break; case -NFS4ERR_STALE_CLIENTID: clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); + nfs4_state_clear_reclaim_reboot(clp); + nfs4_state_start_reclaim_reboot(clp); break; case -NFS4ERR_CLID_INUSE: pr_err("NFS: Server %s reports our clientid is in use\n",