---

yaml --- r: 308666 b: refs/heads/master c: be0bfed h: refs/heads/master v: v3
git-mirror · May 25, 2012 · 34fee16 · 34fee16
1 parent 48cd96e
commit 34fee16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);
 	}