Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / net / sunrpc / svc.c

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index b7210f5cc8934fd35dfa302134a86098b8f78dbf..7e9baaa1e543e55878dcb0d9bd0378a0e51754e0 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1038,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);
 }
 
 /*