net/rds: remove uses of NIPQUAD, use %pI4

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Andy Grover <andy.grover@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c
index 211522f9a9a260cfcd68a7dc2d92c61dba70068a..056256285987dea30ffcb2a93b71bf5af8b904c1 100644 (file)
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@ -90,8 +90,8 @@ int rds_tcp_conn_connect(struct rds_connection *conn)
 
        ret = sock->ops->bind(sock, (struct sockaddr *)&src, sizeof(src));
        if (ret) {
-               rdsdebug("bind failed with %d at address %u.%u.%u.%u\n",
-                    ret, NIPQUAD(conn->c_laddr));
+               rdsdebug("bind failed with %d at address %pI4\n",
+                        ret, &conn->c_laddr);
                goto out;
        }
 
@@ -108,8 +108,7 @@ int rds_tcp_conn_connect(struct rds_connection *conn)
                                 O_NONBLOCK);
        sock = NULL;
 
-       rdsdebug("connect to address %u.%u.%u.%u returned %d\n",
-                NIPQUAD(conn->c_faddr), ret);
+       rdsdebug("connect to address %pI4 returned %d\n", &conn->c_faddr, ret);
        if (ret == -EINPROGRESS)
                ret = 0;
 

diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 45474a4368625431db0a112b3f172bfc7615f002..53cb1b54165d81f0145dbef5b3bc173058383963 100644 (file)
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -66,9 +66,9 @@ static int rds_tcp_accept_one(struct socket *sock)
 
        inet = inet_sk(new_sock->sk);
 
-       rdsdebug("accepted tcp %u.%u.%u.%u:%u -> %u.%u.%u.%u:%u\n",
-                 NIPQUAD(inet->inet_saddr), ntohs(inet->inet_sport),
-                 NIPQUAD(inet->inet_daddr), ntohs(inet->inet_dport));
+       rdsdebug("accepted tcp %pI4:%u -> %pI4:%u\n",
+                &inet->inet_saddr, ntohs(inet->inet_sport),
+                &inet->inet_daddr, ntohs(inet->inet_dport));
 
        conn = rds_conn_create(inet->inet_saddr, inet->inet_daddr,
                               &rds_tcp_transport, GFP_KERNEL);

diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
index ab545e0cd5d6a78da08481139158f6e87231a255..34fdcc059e543271e3a47b07980184351f5e588a 100644 (file)
--- a/net/rds/tcp_send.c
+++ b/net/rds/tcp_send.c
@@ -193,9 +193,9 @@ out:
                        rds_tcp_stats_inc(s_tcp_sndbuf_full);
                        ret = 0;
                } else {
-                       printk(KERN_WARNING "RDS/tcp: send to %u.%u.%u.%u "
+                       printk(KERN_WARNING "RDS/tcp: send to %pI4 "
                               "returned %d, disconnecting and reconnecting\n",
-                              NIPQUAD(conn->c_faddr), ret);
+                              &conn->c_faddr, ret);
                        rds_conn_drop(conn);
                }
        }