[PATCH 0/2] minor nfsd fixes

[PATCH 0/2] minor nfsd fixes

[J. Bruce Fields]

From: "J. Bruce Fields" <bfields@redhat.com>

These are two minor fixes I stumbled across while investigating other
problems.

--b.

J. Bruce Fields (2):
  rpc: fix gss_svc_init cleanup on failure
  nfsd4: Fix forced-expiry locking

 fs/nfsd/nfs4state.c               | 4 ++--
 net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.31.1

[PATCH 1/2] rpc: fix gss_svc_init cleanup on failure

[J. Bruce Fields]

From: "J. Bruce Fields" <bfields@redhat.com>

The failure case here should be rare, but it's obviously wrong.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
 net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index a81be45f40d9..3d685fe328fa 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1980,7 +1980,7 @@ gss_svc_init_net(struct net *net)
 		goto out2;
 	return 0;
 out2:
-	destroy_use_gss_proxy_proc_entry(net);
+	rsi_cache_destroy_net(net);
 out1:
 	rsc_cache_destroy_net(net);
 	return rv;
-- 
2.31.1

[PATCH 2/2] nfsd4: Fix forced-expiry locking

[J. Bruce Fields]

From: "J. Bruce Fields" <bfields@redhat.com>

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>
---
 fs/nfsd/nfs4state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 212f43fa5cba..1b6a7f48982e 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2687,9 +2687,9 @@ static void force_expire_client(struct nfs4_client *clp)
 
 	trace_nfsd_clid_admin_expired(&clp->cl_clientid);
 
-	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);
-- 
2.31.1

Re: [PATCH 0/2] minor nfsd fixes

[Chuck Lever III]

Hi Bruce-

> On Aug 12, 2021, at 4:41 PM, J. Bruce Fields <bfields@redhat.com> wrote:
> 
> From: "J. Bruce Fields" <bfields@redhat.com>
> 
> These are two minor fixes I stumbled across while investigating other
> problems.
> 
> --b.
> 
> J. Bruce Fields (2):
>  rpc: fix gss_svc_init cleanup on failure
>  nfsd4: Fix forced-expiry locking
> 
> fs/nfsd/nfs4state.c               | 4 ++--
> net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)

I will merge these once my power and internet are back on.

--
Chuck Lever