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:18:45 -0800 |
| commit | 25ca7c2dea345aad2e10c07789fa9faea0cc7325 (patch) | |
| tree | 2bbb5385db71c0b88e325bf870bc355d7f29de90 | |
| parent | 122532c9e1706da34036b688fb70c36c49ce2e44 (diff) | |
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>
| -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 d5a0cf15d3cb..430798837a87 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4390,6 +4390,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN) rpc_restart_call_prepare(task); } + nfs_release_seqid(calldata->arg.seqid); } static void nfs4_locku_prepare(struct rpc_task *task, void *data) |