---

yaml --- r: 333155 b: refs/heads/master c: 6938867 h: refs/heads/master i: 333153: 5fe5040 333151: c2f45f3 v: v3
git-mirror · Oct 1, 2012 · 7c72c73 · 7c72c73
1 parent 6ce4b96
commit 7c72c73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb6d9c6b719b633e9b98d26d8a7937209e8bf21
+refs/heads/master: 6938867edba929a65a167a97581231e76aeb10b4
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
@@ -1774,7 +1774,11 @@ static void nfs41_clear_delegation_stateid(struct nfs4_state *state)
 		 * informs us the stateid is unrecognized. */
 		if (status != -NFS4ERR_BAD_STATEID)
 			nfs41_free_stateid(server, stateid);
+		nfs_remove_bad_delegation(state->inode);
 
+		write_seqlock(&state->seqlock);
+		nfs4_stateid_copy(&state->stateid, &state->open_stateid);
+		write_sequnlock(&state->seqlock);
 		clear_bit(NFS_DELEGATED_STATE, &state->flags);
 	}
 }