IPVS: use pr_err and friends instead of IP_VS_ERR and friends

[deliverable/linux.git] / net / netfilter / ipvs / ip_vs_ftp.c

diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 2e7dbd8b73a431fd4ef2b4cdb2346e497e853854..33e2c799cba7427b16784d0f1ce324aa3fadd11c 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -22,6 +22,9 @@
  *
  */
 
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -178,10 +181,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
                                           &start, &end) != 1)
                        return 1;
 
-               IP_VS_DBG(7, "PASV response (%u.%u.%u.%u:%d) -> "
-                         "%u.%u.%u.%u:%d detected\n",
-                         NIPQUAD(from.ip), ntohs(port),
-                         NIPQUAD(cp->caddr.ip), 0);
+               IP_VS_DBG(7, "PASV response (%pI4:%d) -> %pI4:%d detected\n",
+                         &from.ip, ntohs(port), &cp->caddr.ip, 0);
 
                /*
                 * Now update or create an connection entry for it
@@ -312,8 +313,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
                                   &start, &end) != 1)
                return 1;
 
-       IP_VS_DBG(7, "PORT %u.%u.%u.%u:%d detected\n",
-                 NIPQUAD(to.ip), ntohs(port));
+       IP_VS_DBG(7, "PORT %pI4:%d detected\n", &to.ip, ntohs(port));
 
        /* Passive mode off */
        cp->app_data = NULL;
@@ -321,9 +321,9 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
        /*
         * Now update or create a connection entry for it
         */
-       IP_VS_DBG(7, "protocol %s %u.%u.%u.%u:%d %u.%u.%u.%u:%d\n",
+       IP_VS_DBG(7, "protocol %s %pI4:%d %pI4:%d\n",
                  ip_vs_proto_name(iph->protocol),
-                 NIPQUAD(to.ip), ntohs(port), NIPQUAD(cp->vaddr.ip), 0);
+                 &to.ip, ntohs(port), &cp->vaddr.ip, 0);
 
        n_cp = ip_vs_conn_in_get(AF_INET, iph->protocol,
                                 &to, port,
@@ -385,8 +385,8 @@ static int __init ip_vs_ftp_init(void)
                ret = register_ip_vs_app_inc(app, app->protocol, ports[i]);
                if (ret)
                        break;
-               IP_VS_INFO("%s: loaded support on port[%d] = %d\n",
-                          app->name, i, ports[i]);
+               pr_info("%s: loaded support on port[%d] = %d\n",
+                       app->name, i, ports[i]);
        }
 
        if (ret)