diff options
| author | Andy Adamson <andros@netapp.com> | 2013-04-11 15:28:45 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-11 15:39:53 +0200 |
| commit | b9536ad52152ff440231dcc2dd9cfa644f5413c9 (patch) | |
| tree | d600241dc0255e6f29a772200a8e5d98c3497c9d /fs/nfs/nfs4proc.c | |
| parent | nfs: remove unnecessary check for NULL inode->i_flock from nfs_delegation_cla... (diff) | |
| download | linux-b9536ad52152ff440231dcc2dd9cfa644f5413c9.tar.xz linux-b9536ad52152ff440231dcc2dd9cfa644f5413c9.zip | |
NFSv4 release the sequence id in the return on close case
Otherwise we deadlock if state recovery is initiated while we
sleep.
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 264ddb16255f..83197fb60d5f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2275,8 +2275,10 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) if (calldata->arg.fmode == 0) { task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE]; if (calldata->roc && - pnfs_roc_drain(inode, &calldata->roc_barrier, task)) + pnfs_roc_drain(inode, &calldata->roc_barrier, task)) { + nfs_release_seqid(calldata->arg.seqid); goto out_wait; + } } nfs_fattr_init(calldata->res.fattr); |