android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT

Browse Source 
[ Upstream commit 037e56a22ff37f9a9c2330b66cff55d3d1ff9b90 ]

Once the client has processed the CB_LAYOUTRECALL, but has not yet
successfully returned the layout, the server is supposed to switch to
returning NFS4ERR_RETURNCONFLICT. This patch ensures that we handle
that return value correctly.

Fixes: 183d9e7b11 ("pnfs: rework LAYOUTGET retry handling")
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>
This commit is contained in:
Trond Myklebust 2023-11-15 13:55:29 -05:00 committed by Greg Kroah-Hartman
parent 722c700dd8
commit d8caf15ab1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/nfs4proc.c
View File

@ -177,6 +177,7 @@ static int nfs4_map_errors(int err)
case -NFS4ERR_RESOURCE: case -NFS4ERR_RESOURCE:
case -NFS4ERR_LAYOUTTRYLATER: case -NFS4ERR_LAYOUTTRYLATER:
case -NFS4ERR_RECALLCONFLICT: case -NFS4ERR_RECALLCONFLICT:
case -NFS4ERR_RETURNCONFLICT:
return -EREMOTEIO; return -EREMOTEIO;
case -NFS4ERR_WRONGSEC: case -NFS4ERR_WRONGSEC:
case -NFS4ERR_WRONG_CRED: case -NFS4ERR_WRONG_CRED:
@ -563,6 +564,7 @@ static int nfs4_do_handle_exception(struct nfs_server *server,
case -NFS4ERR_GRACE: case -NFS4ERR_GRACE:
case -NFS4ERR_LAYOUTTRYLATER: case -NFS4ERR_LAYOUTTRYLATER:
case -NFS4ERR_RECALLCONFLICT: case -NFS4ERR_RECALLCONFLICT:
case -NFS4ERR_RETURNCONFLICT:
exception->delay = 1; exception->delay = 1;
return 0; return 0;
@ -9445,6 +9447,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task,
status = -EBUSY; status = -EBUSY;
break; break;
case -NFS4ERR_RECALLCONFLICT: case -NFS4ERR_RECALLCONFLICT:
case -NFS4ERR_RETURNCONFLICT:
status = -ERECALLCONFLICT; status = -ERECALLCONFLICT;
break; break;
case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_DELEG_REVOKED: