diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-29 18:53:23 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-11-16 16:47:04 +0000 |
| commit | 4360e736de7c705c936132431ec765803e3c313e (patch) | |
| tree | ce4737f75e2d07ff962f4c00dc3101bf0c554685 /fs/nfs | |
| parent | d6d5a8514ee883d824427e5a70103c180ffbb6e9 (diff) | |
| download | kernel_samsung_smdk4412-4360e736de7c705c936132431ec765803e3c313e.zip kernel_samsung_smdk4412-4360e736de7c705c936132431ec765803e3c313e.tar.gz kernel_samsung_smdk4412-4360e736de7c705c936132431ec765803e3c313e.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: Ben Hutchings <ben@decadent.org.uk>
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 4f07b56..864b831 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4150,6 +4150,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) |