Commit fbfffbd5 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Rename sock_xprt.addr as sock_xprt.srcaddr 



Clean up: Give the "addr" and "port" field less ambiguous names.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f8b761ef

net/sunrpc/xprtsock.c

+12 −12
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ struct sock_xprt { 
	 * Connection of transports

	 */

	struct delayed_work	connect_worker;

	struct sockaddr_storage	addr;

	unsigned short		port;

	struct sockaddr_storage	srcaddr;

	unsigned short		srcport;



	/*

	 * UDP socket buffer size parameters
@@ -1546,7 +1546,7 @@ static void xs_set_port(struct rpc_xprt *xprt, unsigned short port) 


static unsigned short xs_get_srcport(struct sock_xprt *transport, struct socket *sock)

{

	unsigned short port = transport->port;

	unsigned short port = transport->srcport;



	if (port == 0 && transport->xprt.resvport)

		port = xs_get_random_port();
@@ -1555,8 +1555,8 @@ static unsigned short xs_get_srcport(struct sock_xprt *transport, struct socket 


static unsigned short xs_next_srcport(struct sock_xprt *transport, struct socket *sock, unsigned short port)

{

	if (transport->port != 0)

		transport->port = 0;

	if (transport->srcport != 0)

		transport->srcport = 0;

	if (!transport->xprt.resvport)

		return 0;

	if (port <= xprt_min_resvport || port > xprt_max_resvport)
@@ -1574,7 +1574,7 @@ static int xs_bind4(struct sock_xprt *transport, struct socket *sock) 
	unsigned short port = xs_get_srcport(transport, sock);

	unsigned short last;



	sa = (struct sockaddr_in *)&transport->addr;

	sa = (struct sockaddr_in *)&transport->srcaddr;

	myaddr.sin_addr = sa->sin_addr;

	do {

		myaddr.sin_port = htons(port);
@@ -1583,7 +1583,7 @@ static int xs_bind4(struct sock_xprt *transport, struct socket *sock) 
		if (port == 0)

			break;

		if (err == 0) {

			transport->port = port;

			transport->srcport = port;

			break;

		}

		last = port;
@@ -1607,7 +1607,7 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock) 
	unsigned short port = xs_get_srcport(transport, sock);

	unsigned short last;



	sa = (struct sockaddr_in6 *)&transport->addr;

	sa = (struct sockaddr_in6 *)&transport->srcaddr;

	myaddr.sin6_addr = sa->sin6_addr;

	do {

		myaddr.sin6_port = htons(port);
@@ -1616,7 +1616,7 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock) 
		if (port == 0)

			break;

		if (err == 0) {

			transport->port = port;

			transport->srcport = port;

			break;

		}

		last = port;
@@ -2061,7 +2061,7 @@ static void xs_udp_print_stats(struct rpc_xprt *xprt, struct seq_file *seq) 
	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);



	seq_printf(seq, "\txprt:\tudp %u %lu %lu %lu %lu %Lu %Lu\n",

			transport->port,

			transport->srcport,

			xprt->stat.bind_count,

			xprt->stat.sends,

			xprt->stat.recvs,
@@ -2085,7 +2085,7 @@ static void xs_tcp_print_stats(struct rpc_xprt *xprt, struct seq_file *seq) 
		idle_time = (long)(jiffies - xprt->last_used) / HZ;



	seq_printf(seq, "\txprt:\ttcp %u %lu %lu %lu %ld %lu %lu %lu %Lu %Lu\n",

			transport->port,

			transport->srcport,

			xprt->stat.bind_count,

			xprt->stat.connect_count,

			xprt->stat.connect_time,
@@ -2164,7 +2164,7 @@ static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args, 
	memcpy(&xprt->addr, args->dstaddr, args->addrlen);

	xprt->addrlen = args->addrlen;

	if (args->srcaddr)

		memcpy(&new->addr, args->srcaddr, args->addrlen);

		memcpy(&new->srcaddr, args->srcaddr, args->addrlen);



	return xprt;

}