diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:04:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:05:56 -0500 |
| commit | 8aa0a410af8011d557877e558f9ff17c082c6840 (patch) | |
| tree | e347920bcaba78f6af0fecc626c1842f85aeeb83 /fs/nfs/nfs4state.c | |
| parent | 54b50af089552bae368502e35dead67e81129b8d (diff) | |
| parent | abe9a6d57b4544ac208401f9c0a4262814db2be4 (diff) | |
| download | op-kernel-dev-8aa0a410af8011d557877e558f9ff17c082c6840.zip op-kernel-dev-8aa0a410af8011d557877e558f9ff17c082c6840.tar.gz | |
Merge commit 'nfs-for-3.3-4' into nfs-for-next
Conflicts:
fs/nfs/nfs4proc.c
Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
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 bae959e..2f76060 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1106,6 +1106,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); } |
