Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open

Browse source 
[ Upstream commit dcd779dc46540e174a6ac8d52fbed23593407317 ]

The nested if statements here make no sense, as you can never reach
"else" branch in the nested statement. Fix the error handling for
when there is a courtesy client that holds a conflicting deny mode.

Fixes: 3d6942715180 ("NFSD: add support for share reservation conflict to courteous server")
Reported-by: 張智諺 <cc85nod@gmail.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jeff Layton 2023-02-03 13:18:34 -05:00 • committed by Ksawlii
parent 2e28687db0
commit e58e5a9ed0
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/nfsd/nfs4state.c
View file

@ -5296,16 +5296,17 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp,
/* test and set deny mode */ /* test and set deny mode */
spin_lock(&fp->fi_lock); spin_lock(&fp->fi_lock);
status = nfs4_file_check_deny(fp, open->op_share_deny); status = nfs4_file_check_deny(fp, open->op_share_deny);
if (status == nfs_ok) { switch (status) {
if (status != nfserr_share_denied) { case nfs_ok:
set_deny(open->op_share_deny, stp); set_deny(open->op_share_deny, stp);
fp->fi_share_deny |= fp->fi_share_deny |=
(open->op_share_deny & NFS4_SHARE_DENY_BOTH); (open->op_share_deny & NFS4_SHARE_DENY_BOTH);
} else { break;
if (nfs4_resolve_deny_conflicts_locked(fp, false, case nfserr_share_denied:
stp, open->op_share_deny, false)) if (nfs4_resolve_deny_conflicts_locked(fp, false,
status = nfserr_jukebox; stp, open->op_share_deny, false))
} status = nfserr_jukebox;
break;
} }
spin_unlock(&fp->fi_lock); spin_unlock(&fp->fi_lock);