commit be0bfed002e0c64a91dacc42a4dab6e883e6bc7e
author Trond Myklebust <Trond.Myklebust@netapp.com> Fri May 25 16:02:15 2012 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> Fri May 25 16:17:13 2012 -0400
tree 74a9169b134718bcf897a39440683a950d10293d
parent 2a6ee6aa2f6dfc47fce8380ec9e31601c96a693e

NFSv4: When purging the lease, we must clear NFS4CLNT_LEASE_CONFIRM

Otherwise we can end up not sending a new exchange-id/setclientid

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

fs/nfs/nfs4state.c

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 758b9a8..604c600 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1647,6 +1647,7 @@
 {
 	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);
 	}