diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-02-09 15:31:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-29 16:33:42 -0800 |
| commit | 2efb4f6b48f54918213f0b8c3f7135aca328f8f3 (patch) | |
| tree | ee88e7d212c437eec5c225ea8458230b92ef6ea9 /fs/nfs | |
| parent | e9513216eb2c0276e227fbb9a6f754e16c9c7510 (diff) | |
| download | kernel_samsung_smdk4412-2efb4f6b48f54918213f0b8c3f7135aca328f8f3.zip kernel_samsung_smdk4412-2efb4f6b48f54918213f0b8c3f7135aca328f8f3.tar.gz kernel_samsung_smdk4412-2efb4f6b48f54918213f0b8c3f7135aca328f8f3.tar.bz2 | |
NFSv4: Ensure we throw out bad delegation stateids on NFS4ERR_BAD_STATEID
commit b9f9a03150969e4bd9967c20bce67c4de769058f upstream.
To ensure that we don't just reuse the bad delegation when we attempt to
recover the nfs4_state that received the bad stateid error.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
| -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 87822a3..9e7e9a5 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1065,6 +1065,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); } |