IPVS: use pr_err and friends instead of IP_VS_ERR and friends

[pandora-kernel.git] / net / netfilter / ipvs / ip_vs_lblcr.c

diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 5f5e5f4..715b57f 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -111,7 +111,7 @@ ip_vs_dest_set_insert(struct ip_vs_dest_set *set, struct ip_vs_dest *dest)
 
        e = kmalloc(sizeof(*e), GFP_ATOMIC);
        if (e == NULL) {
-               IP_VS_ERR("ip_vs_dest_set_insert(): no memory\n");
+               pr_err("%s(): no memory\n", __func__);
                return NULL;
        }
 
@@ -205,8 +205,9 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)
                }
        }
 
-       IP_VS_DBG_BUF(6, "ip_vs_dest_set_min: server %s:%d "
+       IP_VS_DBG_BUF(6, "%s(): server %s:%d "
                      "activeconns %d refcnt %d weight %d overhead %d\n",
+                     __func__,
                      IP_VS_DBG_ADDR(least->af, &least->addr),
                      ntohs(least->port),
                      atomic_read(&least->activeconns),
@@ -252,8 +253,9 @@ static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set)
                }
        }
 
-       IP_VS_DBG_BUF(6, "ip_vs_dest_set_max: server %s:%d "
+       IP_VS_DBG_BUF(6, "%s(): server %s:%d "
                      "activeconns %d refcnt %d weight %d overhead %d\n",
+                     __func__,
                      IP_VS_DBG_ADDR(most->af, &most->addr), ntohs(most->port),
                      atomic_read(&most->activeconns),
                      atomic_read(&most->refcnt),
@@ -377,7 +379,7 @@ ip_vs_lblcr_new(struct ip_vs_lblcr_table *tbl, const union nf_inet_addr *daddr,
        if (!en) {
                en = kmalloc(sizeof(*en), GFP_ATOMIC);
                if (!en) {
-                       IP_VS_ERR("ip_vs_lblcr_new(): no memory\n");
+                       pr_err("%s(): no memory\n", __func__);
                        return NULL;
                }
 
@@ -511,7 +513,7 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc)
         */
        tbl = kmalloc(sizeof(*tbl), GFP_ATOMIC);
        if (tbl == NULL) {
-               IP_VS_ERR("ip_vs_lblcr_init_svc(): no memory\n");
+               pr_err("%s(): no memory\n", __func__);
                return -ENOMEM;
        }
        svc->sched_data = tbl;
@@ -657,7 +659,7 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
 
        ip_vs_fill_iphdr(svc->af, skb_network_header(skb), &iph);
 
-       IP_VS_DBG(6, "ip_vs_lblcr_schedule(): Scheduling...\n");
+       IP_VS_DBG(6, "%s(): Scheduling...\n", __func__);
 
        /* First look in our cache */
        read_lock(&svc->sched_lock);