aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2021-08-12 16:41:43 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-15 09:47:35 +0200
commiteb3c6a25012fa2b55f71c583cd143a747aaa3361 (patch)
treece451c080df67b520650cc08cbd17fd300a5aa6a
parent81e69d3fdd9e47287a0f3705c154263fe08fa2a7 (diff)
downloadlinux-yocto-eb3c6a25012fa2b55f71c583cd143a747aaa3361.tar.gz
linux-yocto-eb3c6a25012fa2b55f71c583cd143a747aaa3361.tar.bz2
linux-yocto-eb3c6a25012fa2b55f71c583cd143a747aaa3361.zip
nfsd4: Fix forced-expiry locking
[ Upstream commit f7104cc1a9159cd0d3e8526cb638ae0301de4b61 ] This should use the network-namespace-wide client_lock, not the per-client cl_lock. You shouldn't see any bugs unless you're actually using the forced-expiry interface introduced by 89c905beccbb. Fixes: 89c905beccbb "nfsd: allow forced expiration of NFSv4 clients" Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/nfsd/nfs4state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8cb2f744dde6..3283cc2a4e42 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2572,9 +2572,9 @@ static void force_expire_client(struct nfs4_client *clp)
struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
bool already_expired;
- spin_lock(&clp->cl_lock);
+ spin_lock(&nn->client_lock);
clp->cl_time = 0;
- spin_unlock(&clp->cl_lock);
+ spin_unlock(&nn->client_lock);
wait_event(expiry_wq, atomic_read(&clp->cl_rpc_users) == 0);
spin_lock(&nn->client_lock);