net/rds: remove uses of NIPQUAD, use %pI4
Subsystems (3)
PATCH 1/1 net/rds: remove uses of NIPQUAD, use %pI4
From: Joe Perches <[email protected]>
Signed-off-by Joe Perches <[email protected]>
Cc Andy Grover <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
net/rds/tcp_connect.c | 7 +++---- net/rds/tcp_listen.c | 6 +++--- net/rds/tcp_send.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-)
net/rds/tcp_connect.c renamed from net/rds/tcp_connect.c~net-rds-remove-uses-of-nipquad-use-%pi4 +3 -4
@@ -90,8 +90,8 @@ int rds_tcp_conn_connect(struct rds_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_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 ;
net/rds/tcp_listen.c renamed from net/rds/tcp_listen.c~net-rds-remove-uses-of-nipquad-use-%pi4 +3 -3
@@ -66,9 +66,9 @@ static int rds_tcp_accept_one(struct soc 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 );
net/rds/tcp_send.c renamed from net/rds/tcp_send.c~net-rds-remove-uses-of-nipquad-use-%pi4 +2 -2
@@ -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); } }
_
From: [email protected]
Date: Tue, 02 Feb 2010 14:43:59 -0800
Quoted 5 lines
From: Joe Perches <[email protected]>
Signed-off-by Joe Perches <[email protected]>Cc Andy Grover <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Applied.