From 34fee1685671b925bea1c5c359b54bcc52c9e871 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 25 May 2012 16:02:15 -0400
Subject: [PATCH] --- yaml --- r: 308666 b: refs/heads/master c:
 be0bfed002e0c64a91dacc42a4dab6e883e6bc7e h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/nfs/nfs4state.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 149b6f56981b..4cf28c752770 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a6ee6aa2f6dfc47fce8380ec9e31601c96a693e
+refs/heads/master: be0bfed002e0c64a91dacc42a4dab6e883e6bc7e
diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c
index 758b9a8a54b3..604c6009d1ac 100644
--- a/trunk/fs/nfs/nfs4state.c
+++ b/trunk/fs/nfs/nfs4state.c
@@ -1647,6 +1647,7 @@ static void nfs4_reset_all_state(struct nfs_client *clp)
 {
 	if (test_and_set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) == 0) {
 		set_bit(NFS4CLNT_PURGE_STATE, &clp->cl_state);
+		clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);
 		nfs4_state_start_reclaim_nograce(clp);
 		nfs4_schedule_state_manager(clp);
 	}