SUNRPC: Remove svc_shutdown_net()

Clean up: svc_shutdown_net() now does nothing but call
svc_close_net(). Replace all external call sites.

svc_close_net() is renamed to be the inverse of svc_xprt_create().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index bba6f2b45b64abe426a2f768a9709750682526dd..c83ec4a375bc1a3dd4826ca509895ed2f99a1b4f 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -248,7 +248,7 @@ out_err:
        if (warned++ == 0)
                printk(KERN_WARNING
                        "lockd_up: makesock failed, error=%d\n", err);
-       svc_shutdown_net(serv, net);
+       svc_xprt_destroy_all(serv, net);
        svc_rpcb_cleanup(serv, net);
        return err;
 }
@@ -287,7 +287,7 @@ static void lockd_down_net(struct svc_serv *serv, struct net *net)
                        nlm_shutdown_hosts_net(net);
                        cancel_delayed_work_sync(&ln->grace_period_end);
                        locks_end_grace(&ln->lockd_manager);
-                       svc_shutdown_net(serv, net);
+                       svc_xprt_destroy_all(serv, net);
                        svc_rpcb_cleanup(serv, net);
                }
        } else {

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index c1a8767100ae9716abaf3d012928806ce32e09b7..c98c68513590f91f4be093c1bbb160f45132652f 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -189,7 +189,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc
                return;
 
        dprintk("NFS: destroy per-net callback data; net=%x\n", net->ns.inum);
-       svc_shutdown_net(serv, net);
+       svc_xprt_destroy_all(serv, net);
 }
 
 static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index ae25b7b3af99e57a56c8771b7115fec84864f141..b92d272f4ba6bdf7823a7a0de91215d64e2249c6 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -722,7 +722,7 @@ void nfsd_put(struct net *net)
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
        if (kref_put(&nn->nfsd_serv->sv_refcnt, nfsd_noop)) {
-               svc_shutdown_net(nn->nfsd_serv, net);
+               svc_xprt_destroy_all(nn->nfsd_serv, net);
                nfsd_last_thread(nn->nfsd_serv, net);
                svc_destroy(&nn->nfsd_serv->sv_refcnt);
                spin_lock(&nfsd_notifier_lock);

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 63794d772eb33bc86bcaccce72411719db2ef1bb..5603158b2aa71fa030ab95f3b338be1d1caa7653 100644 (file)
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -508,7 +508,6 @@ struct svc_serv *  svc_create_pooled(struct svc_program *, unsigned int,
                        const struct svc_serv_ops *);
 int               svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
 int               svc_pool_stats_open(struct svc_serv *serv, struct file *file);
-void              svc_shutdown_net(struct svc_serv *, struct net *);
 int               svc_process(struct svc_rqst *);
 int               bc_svc_process(struct svc_serv *, struct rpc_rqst *,
                        struct svc_rqst *);

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index bf7d029fb48c0c4eaab27f58ee54c338ff98a72b..42e113742429b3895a3c465c0e6cd7e66f3b2818 100644 (file)
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -131,6 +131,7 @@ int svc_xprt_create(struct svc_serv *serv, const char *xprt_name,
                        struct net *net, const int family,
                        const unsigned short port, int flags,
                        const struct cred *cred);
+void   svc_xprt_destroy_all(struct svc_serv *serv, struct net *net);
 void   svc_xprt_received(struct svc_xprt *xprt);
 void   svc_xprt_enqueue(struct svc_xprt *xprt);
 void   svc_xprt_put(struct svc_xprt *xprt);

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 53efef3db3a9caad9505d58d2038444c4661e837..08d6847464529124dd934e5009e2735cc9e62a0a 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -536,12 +536,6 @@ out_err:
 }
 EXPORT_SYMBOL_GPL(svc_create_pooled);
 
-void svc_shutdown_net(struct svc_serv *serv, struct net *net)
-{
-       svc_close_net(serv, net);
-}
-EXPORT_SYMBOL_GPL(svc_shutdown_net);
-
 /*
  * Destroy an RPC service. Should be called with appropriate locking to
  * protect sv_permsocks and sv_tempsocks.

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 6809116c996a67883d5763e24e6f513a67c008f4..0c117d3bfda800717f1583f5653a909897c1d653 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -1140,7 +1140,11 @@ static void svc_clean_up_xprts(struct svc_serv *serv, struct net *net)
        }
 }
 
-/*
+/**
+ * svc_xprt_destroy_all - Destroy transports associated with @serv
+ * @serv: RPC service to be shut down
+ * @net: target network namespace
+ *
  * Server threads may still be running (especially in the case where the
  * service is still running in other network namespaces).
  *
@@ -1152,7 +1156,7 @@ static void svc_clean_up_xprts(struct svc_serv *serv, struct net *net)
  * threads, we may need to wait a little while and then check again to
  * see if they're done.
  */
-void svc_close_net(struct svc_serv *serv, struct net *net)
+void svc_xprt_destroy_all(struct svc_serv *serv, struct net *net)
 {
        int delay = 0;
 
@@ -1163,6 +1167,7 @@ void svc_close_net(struct svc_serv *serv, struct net *net)
                msleep(delay++);
        }
 }
+EXPORT_SYMBOL_GPL(svc_xprt_destroy_all);
 
 /*
  * Handle defer and revisit of requests