diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-29 18:53:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 13:14:21 -0800 |
| commit | f354d0c0ca37522c2efcced954ade7cdca479a98 (patch) | |
| tree | d43378e9de807da35b7b09f6314456bd7c72a504 /fs/nfs | |
| parent | 6fbd3cdb9365377e3d0fb5b4c86e16d71678103b (diff) | |
| download | kernel_samsung_smdk4412-f354d0c0ca37522c2efcced954ade7cdca479a98.zip kernel_samsung_smdk4412-f354d0c0ca37522c2efcced954ade7cdca479a98.tar.gz kernel_samsung_smdk4412-f354d0c0ca37522c2efcced954ade7cdca479a98.tar.bz2 | |
NFSv4: nfs4_locku_done must release the sequence id
commit 2b1bc308f492589f7d49012ed24561534ea2be8c upstream.
If the state recovery machinery is triggered by the call to
nfs4_async_handle_error() then we can deadlock.
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/nfs4proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c722905..d5d5400 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4116,6 +4116,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) nfs_restart_rpc(task, calldata->server->nfs_client); } + nfs_release_seqid(calldata->arg.seqid); } static void nfs4_locku_prepare(struct rpc_task *task, void *data) |