From 4eb976cba4b51bcbec489a86fd1783882826977b Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 9 Feb 2012 15:31:36 -0500 Subject: [PATCH] --- yaml --- r: 287783 b: refs/heads/master c: b9f9a03150969e4bd9967c20bce67c4de769058f h: refs/heads/master i: 287781: 790c6822d94bc9ecd2a9073450cc46d14e1f4baf 287779: 3dbf932d83e21726a6705e43088ea241976a7cd1 287775: 3fce43792fde3f8832934960120391912264bd01 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4state.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c24c23102e65..719d138f71ce 100644 --- 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 index a53f33b4ac3a..45392032e7bd 100644 --- 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); }