Skip to content

Commit dcd779d

Browse files
jtlaytonchucklever
authored andcommitted
nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open
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: 3d69427 ("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>
1 parent 81e7229 commit dcd779d

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

fs/nfsd/nfs4state.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5282,16 +5282,17 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp,
52825282
/* test and set deny mode */
52835283
spin_lock(&fp->fi_lock);
52845284
status = nfs4_file_check_deny(fp, open->op_share_deny);
5285-
if (status == nfs_ok) {
5286-
if (status != nfserr_share_denied) {
5287-
set_deny(open->op_share_deny, stp);
5288-
fp->fi_share_deny |=
5289-
(open->op_share_deny & NFS4_SHARE_DENY_BOTH);
5290-
} else {
5291-
if (nfs4_resolve_deny_conflicts_locked(fp, false,
5292-
stp, open->op_share_deny, false))
5293-
status = nfserr_jukebox;
5294-
}
5285+
switch (status) {
5286+
case nfs_ok:
5287+
set_deny(open->op_share_deny, stp);
5288+
fp->fi_share_deny |=
5289+
(open->op_share_deny & NFS4_SHARE_DENY_BOTH);
5290+
break;
5291+
case nfserr_share_denied:
5292+
if (nfs4_resolve_deny_conflicts_locked(fp, false,
5293+
stp, open->op_share_deny, false))
5294+
status = nfserr_jukebox;
5295+
break;
52955296
}
52965297
spin_unlock(&fp->fi_lock);
52975298

0 commit comments

Comments
 (0)