diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-11-13 09:39:36 +0100 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-11-13 16:37:17 +0100 |
| commit | 5326de9e94bedcf7366e7e7625d4deb8c1f1ca8a (patch) | |
| tree | 544d90ca1ed195416bbb5ae024a5a192e02d3ef2 /fs/nfs | |
| parent | NFSv4.x: Handle bad/dead sessions correctly in nfs41_sequence_process() (diff) | |
| download | linux-dev-5326de9e94bedcf7366e7e7625d4deb8c1f1ca8a.tar.xz linux-dev-5326de9e94bedcf7366e7e7625d4deb8c1f1ca8a.zip | |
NFSv4.x: Drop the slot if nfs4_delegreturn_prepare waits for layoutreturn
If nfs4_delegreturn_prepare needs to wait for a layoutreturn to complete
then make sure we drop the sequence slot if we hold it.
Fixes: 1c5bd76d17cc ("pNFS: Enable layoutreturn operation for return-on-close")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs')
| -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 d1a7facfa926..2d3c12f68204 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6256,8 +6256,10 @@ static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data) d_data = (struct nfs4_delegreturndata *)data; - if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task)) + if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task)) { + nfs4_sequence_done(task, &d_data->res.seq_res); return; + } lo = d_data->args.lr_args ? d_data->args.lr_args->layout : NULL; if (lo && !pnfs_layout_is_valid(lo)) { |