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:16:11 -0800 |
| commit | 8827f3112b5f3bd0ffa21dc647cb22b197558c59 (patch) | |
| tree | 5f0c0c36b291523ebcced14acf135bcd4879e549 /fs | |
| parent | 43113027b701f7b3f63c577056a9160dd3053f37 (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>
Diffstat (limited to 'fs')
| -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 b106b9729bcf..3b005ebb4685 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4306,6 +4306,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) |