---

yaml --- r: 308667 b: refs/heads/master c: 89a2173 h: refs/heads/master i: 308665: 48cd96e 308663: 0746040 v: v3
git-mirror · May 25, 2012 · 41b5205 · 41b5205
1 parent 34fee16
commit 41b5205
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be0bfed002e0c64a91dacc42a4dab6e883e6bc7e
+refs/heads/master: 89a217360ef4e96eb83758cb9647f1c42581b097
diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c
@@ -1580,6 +1580,11 @@ static int nfs4_check_lease(struct nfs_client *clp)
 static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status)
 {
 	switch (status) {
+	case -NFS4ERR_SEQ_MISORDERED:
+		if (test_and_set_bit(NFS4CLNT_PURGE_STATE, &clp->cl_state))
+			return -ESERVERFAULT;
+		/* Lease confirmation error: retry after purging the lease */
+		ssleep(1);
 	case -NFS4ERR_CLID_INUSE:
 	case -NFS4ERR_STALE_CLIENTID:
 		clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);