| From cd44056c3879de17a111bbfb8cb505d76c74f012 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@hammerspace.com> |
| Date: Wed, 13 Nov 2019 09:39:36 +0100 |
| Subject: [PATCH] NFSv4.x: Drop the slot if nfs4_delegreturn_prepare waits for |
| layoutreturn |
| |
| commit 5326de9e94bedcf7366e7e7625d4deb8c1f1ca8a upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c |
| index eee199008bb8..296b214c0b58 100644 |
| --- a/fs/nfs/nfs4proc.c |
| +++ b/fs/nfs/nfs4proc.c |
| @@ -6198,8 +6198,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)) { |
| -- |
| 2.7.4 |
| |