Commit 6884b348 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Andy Grover <andy.grover@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 650b2ef5

net/rds/tcp_connect.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

net/rds/tcp_listen.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

net/rds/tcp_send.c

+2 −2
Original line number Diff line number Diff line
@@ -193,9 +193,9 @@ int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm, 
			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);

		}

	}