diff options
author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 10:39:16 +0100 |
---|---|---|
committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 10:39:16 +0100 |
commit | 0afa1b62e33250d4777c5803a98ae69fbe872061 (patch) | |
tree | 1c747bc01b62bca85d277e2c8321ae6cf0006ed8 /fs/nfs/nfs4state.c | |
parent | LDM: Fix reassembly of extended VBLKs. (diff) | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
download | linux-0afa1b62e33250d4777c5803a98ae69fbe872061.tar.xz linux-0afa1b62e33250d4777c5803a98ae69fbe872061.zip |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r-- | fs/nfs/nfs4state.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index a53f33b4ac3a..45392032e7bd 100644 --- a/fs/nfs/nfs4state.c +++ b/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); } |