Merge tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into...

[~andy/linux] / net / sunrpc / svc.c

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index e6d542cee0f30538c554c46c90fe2661430de03e..7e9baaa1e543e55878dcb0d9bd0378a0e51754e0 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -537,8 +537,6 @@ EXPORT_SYMBOL_GPL(svc_shutdown_net);
 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);
@@ -553,8 +551,6 @@ svc_destroy(struct svc_serv *serv)
 
        del_timer_sync(&serv->sv_temptimer);
 
-       svc_shutdown_net(serv, net);
-
        /*
         * The last user is gone and thus all sockets have to be destroyed to
         * the point. Check this.
@@ -1042,23 +1038,21 @@ static void svc_unregister(const struct svc_serv *serv, struct net *net)
  * Printk the given error with the address of the client that caused it.
  */
 static __printf(2, 3)
-int svc_printk(struct svc_rqst *rqstp, const char *fmt, ...)
+void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...)
 {
+       struct va_format vaf;
        va_list args;
-       int     r;
        char    buf[RPC_MAX_ADDRBUFLEN];
 
-       if (!net_ratelimit())
-               return 0;
+       va_start(args, fmt);
 
-       printk(KERN_WARNING "svc: %s: ",
-               svc_print_addr(rqstp, buf, sizeof(buf)));
+       vaf.fmt = fmt;
+       vaf.va = &args;
 
-       va_start(args, fmt);
-       r = vprintk(fmt, args);
-       va_end(args);
+       net_warn_ratelimited("svc: %s: %pV",
+                            svc_print_addr(rqstp, buf, sizeof(buf)), &vaf);
 
-       return r;
+       va_end(args);
 }
 
 /*