diff options
| author | NeilBrown <neilb@suse.de> | 2024-09-23 09:46:05 +1000 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2024-09-23 10:37:32 -0400 |
| commit | 53e4e17557049d7688ca9dadeae80864d40cf0b7 (patch) | |
| tree | 49b19cbfc9934b43df3101075b12ae5387caa5b5 | |
| parent | dc0d0f885aa422f621bc1c2124133eff566b0bc8 (diff) | |
| download | lwn-53e4e17557049d7688ca9dadeae80864d40cf0b7.tar.gz lwn-53e4e17557049d7688ca9dadeae80864d40cf0b7.zip | |
nfsd: nfsd_destroy_serv() must call svc_destroy() even if nfsd_startup_net() failed
If nfsd_startup_net() fails and so ->nfsd_net_up is false,
nfsd_destroy_serv() doesn't currently call svc_destroy(). It should.
Fixes: 1e3577a4521e ("SUNRPC: discard sv_refcnt, and svc_get/svc_put")
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
| -rw-r--r-- | fs/nfsd/nfssvc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index defc430f912f..5f8637b7a7a4 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -385,6 +385,9 @@ static void nfsd_shutdown_net(struct net *net) { struct nfsd_net *nn = net_generic(net, nfsd_net_id); + if (!nn->nfsd_net_up) + return; + nfsd_export_flush(net); nfs4_state_shutdown_net(net); nfsd_reply_cache_shutdown(nn); nfsd_file_cache_shutdown_net(net); @@ -492,11 +495,8 @@ void nfsd_destroy_serv(struct net *net) * other initialization has been done except the rpcb information. */ svc_rpcb_cleanup(serv, net); - if (!nn->nfsd_net_up) - return; nfsd_shutdown_net(net); - nfsd_export_flush(net); svc_destroy(&serv); } |