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>

7 files changed, 27 insertions, 38 deletions

diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 65a8cd7891fe..7eaf98799729 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -438,9 +438,8 @@ int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowidn
                         res->fi = NULL;
                         return 1;
                 default:
-                        if (net_ratelimit())
-                                printk("DECnet: impossible routing event : dn_fib_semantic_match type=%d\n",
-                                       type);
+                        net_err_ratelimited("DECnet: impossible routing event : dn_fib_semantic_match type=%d\n",
+                                            type);
                         res->fi = NULL;
                         return -EINVAL;
                 }
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index ee7013f24fca..ac90f658586c 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -162,8 +162,8 @@ static int dn_neigh_construct(struct neighbour *neigh)
         else if ((dev->type == ARPHRD_ETHER) || (dev->type == ARPHRD_LOOPBACK))
                 dn_dn2eth(neigh->ha, dn->addr);
         else {
-                if (net_ratelimit())
-                        printk(KERN_DEBUG "Trying to create neigh for hw %d\n",  dev->type);
+                net_dbg_ratelimited("Trying to create neigh for hw %d\n",
+                                    dev->type);
                 return -EINVAL;
         }
 
@@ -236,15 +236,13 @@ static int dn_long_output(struct neighbour *neigh, struct sk_buff *skb)
         if (skb_headroom(skb) < headroom) {
                 struct sk_buff *skb2 = skb_realloc_headroom(skb, headroom);
                 if (skb2 == NULL) {
-                        if (net_ratelimit())
-                                printk(KERN_CRIT "dn_long_output: no memory\n");
+                        net_crit_ratelimited("dn_long_output: no memory\n");
                         kfree_skb(skb);
                         return -ENOBUFS;
                 }
                 kfree_skb(skb);
                 skb = skb2;
-                if (net_ratelimit())
-                        printk(KERN_INFO "dn_long_output: Increasing headroom\n");
+                net_info_ratelimited("dn_long_output: Increasing headroom\n");
         }
 
         data = skb_push(skb, sizeof(struct dn_long_packet) + 3);
@@ -281,15 +279,13 @@ static int dn_short_output(struct neighbour *neigh, struct sk_buff *skb)
         if (skb_headroom(skb) < headroom) {
                 struct sk_buff *skb2 = skb_realloc_headroom(skb, headroom);
                 if (skb2 == NULL) {
-                        if (net_ratelimit())
-                                printk(KERN_CRIT "dn_short_output: no memory\n");
+                        net_crit_ratelimited("dn_short_output: no memory\n");
                         kfree_skb(skb);
                         return -ENOBUFS;
                 }
                 kfree_skb(skb);
                 skb = skb2;
-                if (net_ratelimit())
-                        printk(KERN_INFO "dn_short_output: Increasing headroom\n");
+                net_info_ratelimited("dn_short_output: Increasing headroom\n");
         }
 
         data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
@@ -322,15 +318,13 @@ static int dn_phase3_output(struct neighbour *neigh, struct sk_buff *skb)
         if (skb_headroom(skb) < headroom) {
                 struct sk_buff *skb2 = skb_realloc_headroom(skb, headroom);
                 if (skb2 == NULL) {
-                        if (net_ratelimit())
-                                printk(KERN_CRIT "dn_phase3_output: no memory\n");
+                        net_crit_ratelimited("dn_phase3_output: no memory\n");
                         kfree_skb(skb);
                         return -ENOBUFS;
                 }
                 kfree_skb(skb);
                 skb = skb2;
-                if (net_ratelimit())
-                        printk(KERN_INFO "dn_phase3_output: Increasing headroom\n");
+                net_info_ratelimited("dn_phase3_output: Increasing headroom\n");
         }
 
         data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 58084f37151e..c344163e6ac0 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -80,12 +80,15 @@ extern int decnet_log_martians;
 
 static void dn_log_martian(struct sk_buff *skb, const char *msg)
 {
-        if (decnet_log_martians && net_ratelimit()) {
+        if (decnet_log_martians) {
                 char *devname = skb->dev ? skb->dev->name : "???";
                 struct dn_skb_cb *cb = DN_SKB_CB(skb);
-                printk(KERN_INFO "DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n",
-                       msg, devname, le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
-                       le16_to_cpu(cb->src_port), le16_to_cpu(cb->dst_port));
+                net_info_ratelimited("DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n",
+                                     msg, devname,
+                                     le16_to_cpu(cb->src),
+                                     le16_to_cpu(cb->dst),
+                                     le16_to_cpu(cb->src_port),
+                                     le16_to_cpu(cb->dst_port));
         }
 }
 
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index b952f88d9c1f..564a6ad13ce7 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -1,4 +1,3 @@
-
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
  *              operating system.  DECnet is implemented using the  BSD Socket
@@ -554,8 +553,8 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
         unsigned char *msg;
 
         if ((dst == NULL) || (rem == 0)) {
-                if (net_ratelimit())
-                        printk(KERN_DEBUG "DECnet: dn_nsp_do_disc: BUG! Please report this to SteveW@ACM.org rem=%u dst=%p\n", le16_to_cpu(rem), dst);
+                net_dbg_ratelimited("DECnet: dn_nsp_do_disc: BUG! Please report this to SteveW@ACM.org rem=%u dst=%p\n",
+                                    le16_to_cpu(rem), dst);
                 return;
         }
 
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 7e1f8788da19..586302e557ad 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -748,8 +748,7 @@ static int dn_output(struct sk_buff *skb)
                        dn_to_neigh_output);
 
 error:
-        if (net_ratelimit())
-                printk(KERN_DEBUG "dn_output: This should not happen\n");
+        net_dbg_ratelimited("dn_output: This should not happen\n");
 
         kfree_skb(skb);
 
@@ -807,12 +806,10 @@ drop:
  */
 static int dn_rt_bug(struct sk_buff *skb)
 {
-        if (net_ratelimit()) {
-                struct dn_skb_cb *cb = DN_SKB_CB(skb);
+        struct dn_skb_cb *cb = DN_SKB_CB(skb);
 
-                printk(KERN_DEBUG "dn_rt_bug: skb from:%04x to:%04x\n",
-                                le16_to_cpu(cb->src), le16_to_cpu(cb->dst));
-        }
+        net_dbg_ratelimited("dn_rt_bug: skb from:%04x to:%04x\n",
+                            le16_to_cpu(cb->src), le16_to_cpu(cb->dst));
 
         kfree_skb(skb);
 
@@ -1327,9 +1324,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
 
                 out_dev = DN_FIB_RES_DEV(res);
                 if (out_dev == NULL) {
-                        if (net_ratelimit())
-                                printk(KERN_CRIT "Bug in dn_route_input_slow() "
-                                                 "No output device\n");
+                        net_crit_ratelimited("Bug in dn_route_input_slow() No output device\n");
                         goto e_inval;
                 }
                 dev_hold(out_dev);
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index a9a62f225a6b..650f3380c98a 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -836,8 +836,8 @@ struct dn_fib_table *dn_fib_get_table(u32 n, int create)
         if (!create)
                 return NULL;
 
-        if (in_interrupt() && net_ratelimit()) {
-                printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table from interrupt\n");
+        if (in_interrupt()) {
+                net_dbg_ratelimited("DECnet: BUG! Attempt to create routing table from interrupt\n");
                 return NULL;
         }
 
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index 1531135130db..44b890936fc0 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -57,8 +57,7 @@ nlmsg_failure:
         if (skb)
                 kfree_skb(skb);
         *errp = -ENOMEM;
-        if (net_ratelimit())
-                printk(KERN_ERR "dn_rtmsg: error creating netlink message\n");
+        net_err_ratelimited("dn_rtmsg: error creating netlink message\n");
         return NULL;
 }