diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2023-03-21 00:17:36 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-20 12:04:38 +0200 |
| commit | e573c833f4cd479ee6803d25b8389be6b9442631 (patch) | |
| tree | dd5bb6970c09feaf12ce88fb04d7760eec8ce636 | |
| parent | 958230432a0f5488e3aab31ad578cee783e517b1 (diff) | |
| download | linux-stable-e573c833f4cd479ee6803d25b8389be6b9442631.tar.gz linux-stable-e573c833f4cd479ee6803d25b8389be6b9442631.tar.bz2 linux-stable-e573c833f4cd479ee6803d25b8389be6b9442631.zip | |
NFSv4: Fix hangs when recovering open state after a server reboot
[ Upstream commit 6165a16a5ad9b237bb3131cff4d3c601ccb8f9a3 ]
When we're using a cached open stateid or a delegation in order to avoid
sending a CLAIM_PREVIOUS open RPC call to the server, we don't have a
new open stateid to present to update_open_stateid().
Instead rely on nfs4_try_open_cached(), just as if we were doing a
normal open.
Fixes: d2bfda2e7aa0 ("NFSv4: don't reprocess cached open CLAIM_PREVIOUS")
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 70150894ed77..3651619468d7 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1851,8 +1851,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) if (!data->rpc_done) { if (data->rpc_status) return ERR_PTR(data->rpc_status); - /* cached opens have already been processed */ - goto update; + return nfs4_try_open_cached(data); } ret = nfs_refresh_inode(inode, &data->f_attr); @@ -1861,7 +1860,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) if (data->o_res.delegation_type != 0) nfs4_opendata_check_deleg(data, state); -update: + if (!update_open_stateid(state, &data->o_res.stateid, NULL, data->o_arg.fmode)) return ERR_PTR(-EAGAIN); |