net: Convert net_ratelimit uses to net_<level>_ratelimited

Standardize the net core ratelimited logging functions.

Coalesce formats, align arguments.
Change a printk then vprintk sequence to use printf extension %pV.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 18 deletions

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index f0132b2e875e..a6de09de5d21 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -617,11 +617,8 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
         rqstp->rq_prot = IPPROTO_UDP;
 
         if (!svc_udp_get_dest_address(rqstp, cmh)) {
-                if (net_ratelimit())
-                        printk(KERN_WARNING
-                                "svc: received unknown control message %d/%d; "
-                                "dropping RPC reply datagram\n",
-                                        cmh->cmsg_level, cmh->cmsg_type);
+                net_warn_ratelimited("svc: received unknown control message %d/%d; dropping RPC reply datagram\n",
+                                     cmh->cmsg_level, cmh->cmsg_type);
                 skb_free_datagram_locked(svsk->sk_sk, skb);
                 return 0;
         }
@@ -871,18 +868,17 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)
                 if (err == -ENOMEM)
                         printk(KERN_WARNING "%s: no more sockets!\n",
                                serv->sv_name);
-                else if (err != -EAGAIN && net_ratelimit())
-                        printk(KERN_WARNING "%s: accept failed (err %d)!\n",
-                                   serv->sv_name, -err);
+                else if (err != -EAGAIN)
+                        net_warn_ratelimited("%s: accept failed (err %d)!\n",
+                                             serv->sv_name, -err);
                 return NULL;
         }
         set_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags);
 
         err = kernel_getpeername(newsock, sin, &slen);
         if (err < 0) {
-                if (net_ratelimit())
-                        printk(KERN_WARNING "%s: peername failed (err %d)!\n",
-                                   serv->sv_name, -err);
+                net_warn_ratelimited("%s: peername failed (err %d)!\n",
+                                     serv->sv_name, -err);
                 goto failed;            /* aborted connection or whatever */
         }
 
@@ -1012,19 +1008,15 @@ static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp)
                          *  bit set in the fragment length header.
                          *  But apparently no known nfs clients send fragmented
                          *  records. */
-                        if (net_ratelimit())
-                                printk(KERN_NOTICE "RPC: multiple fragments "
-                                        "per record not supported\n");
+                        net_notice_ratelimited("RPC: multiple fragments per record not supported\n");
                         goto err_delete;
                 }
 
                 svsk->sk_reclen &= RPC_FRAGMENT_SIZE_MASK;
                 dprintk("svc: TCP record, %d bytes\n", svsk->sk_reclen);
                 if (svsk->sk_reclen > serv->sv_max_mesg) {
-                        if (net_ratelimit())
-                                printk(KERN_NOTICE "RPC: "
-                                        "fragment too large: 0x%08lx\n",
-                                        (unsigned long)svsk->sk_reclen);
+                        net_notice_ratelimited("RPC: fragment too large: 0x%08lx\n",
+                                               (unsigned long)svsk->sk_reclen);
                         goto err_delete;
                 }
         }