Merge tag 'nfs-for-6.12-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux.git] / fs / nfsd / nfssvc.c

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 47172b407be848137621a2935f343623105b1e2b..49e2f32102ab59b8a973f1a82bf6aa33e7e3b3cc 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -434,6 +434,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);
@@ -549,11 +552,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);
 }