SUNRPC: service destruction in network namespace context

v2: Added comment to BUG_ON's in svc_destroy() to make code looks clearer.

This patch introduces network namespace filter for service destruction
function.
Nothing special here - just do exactly the same operations, but only for
tranports in passed networks namespace context.
BTW, BUG_ON() checks for empty service transports lists were returned into
svc_destroy() function. This is because of swithing generic svc_close_all() to
networks namespace dependable svc_close_net().

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a8b49a044619..6cc0ea3d26f1 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -517,6 +517,8 @@ EXPORT_SYMBOL_GPL(svc_create_pooled);
 void
 svc_destroy(struct svc_serv *serv)
 {
+        struct net *net = current->nsproxy->net_ns;
+
         dprintk("svc: svc_destroy(%s, %d)\n",
                                 serv->sv_program->pg_name,
                                 serv->sv_nrthreads);
@@ -539,10 +541,17 @@ svc_destroy(struct svc_serv *serv)
          * caller is using--nfsd_mutex in the case of nfsd).  So it's
          * safe to traverse those lists and shut everything down:
          */
-        svc_close_all(serv);
+        svc_close_net(serv, net);
+
+        /*
+         * The last user is gone and thus all sockets have to be destroyed to
+         * the point. Check this.
+         */
+        BUG_ON(!list_empty(&serv->sv_permsocks));
+        BUG_ON(!list_empty(&serv->sv_tempsocks));
 
         if (serv->sv_shutdown)
-                serv->sv_shutdown(serv, current->nsproxy->net_ns);
+                serv->sv_shutdown(serv, net);
 
         cache_clean_deferred(serv);