mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 05:32:00 +00:00
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: 1e3577a452
("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>
This commit is contained in:
parent
dc0d0f885a
commit
53e4e17557
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user