---

yaml --- r: 287783 b: refs/heads/master c: b9f9a03 h: refs/heads/master i: 287781: 790c682 287779: 3dbf932 287775: 3fce437 v: v3
git-mirror · Feb 9, 2012 · 4eb976c · 4eb976c
1 parent c4a1e24
commit 4eb976c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 331818f1c468a24e581aedcbe52af799366a9dfe
+refs/heads/master: b9f9a03150969e4bd9967c20bce67c4de769058f
diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c
@@ -1132,6 +1132,8 @@ void nfs4_schedule_stateid_recovery(const struct nfs_server *server, struct nfs4
 {
 	struct nfs_client *clp = server->nfs_client;
 
+	if (test_and_clear_bit(NFS_DELEGATED_STATE, &state->flags))
+		nfs_async_inode_return_delegation(state->inode, &state->stateid);
 	nfs4_state_mark_reclaim_nograce(clp, state);
 	nfs4_schedule_state_manager(clp);
 }