nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open
authorJeff Layton <jlayton@kernel.org>
Fri, 3 Feb 2023 18:18:34 +0000 (13:18 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:33:24 +0000 (09:33 +0100)
commit521b6116151be77a197aefd50ebc9ab4f5be5d1f
tree8053bcaf03463b0285c8c442141b8657891f10e7
parent598e2d5d911ded514146b02982c061ec61ee7829
nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open

[ 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>
fs/nfsd/nfs4state.c