lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSv4: Fix hangs when recovering open state after a server reboot

Browse Source 
commit 6165a16a5ad9b237bb3131cff4d3c601ccb8f9a3 upstream.

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: d2bfda2e7a ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Trond Myklebust 2023-03-21 00:17:36 -04:00 committed by Greg Kroah-Hartman
parent c81e2965a9
commit f3a6726878
1 changed files with 2 additions and 3 deletions

5
fs/nfs/nfs4proc.c
View File

@ -1934,8 +1934,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
if (!data->rpc_done) { if (!data->rpc_done) {
if (data->rpc_status) if (data->rpc_status)
return ERR_PTR(data->rpc_status); return ERR_PTR(data->rpc_status);
/* cached opens have already been processed */ return nfs4_try_open_cached(data);
goto update;
} }
ret = nfs_refresh_inode(inode, &data->f_attr); ret = nfs_refresh_inode(inode, &data->f_attr);
@ -1944,7 +1943,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
if (data->o_res.delegation_type != 0) if (data->o_res.delegation_type != 0)
nfs4_opendata_check_deleg(data, state); nfs4_opendata_check_deleg(data, state);
update:
if (!update_open_stateid(state, &data->o_res.stateid, if (!update_open_stateid(state, &data->o_res.stateid,
NULL, data->o_arg.fmode)) NULL, data->o_arg.fmode))
return ERR_PTR(-EAGAIN); return ERR_PTR(-EAGAIN);