Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

SUNRPC: Kill RPC_DISPLAY_ALL 



At some point, I recall that rpc_pipe_fs used RPC_DISPLAY_ALL.
Currently there are no uses of RPC_DISPLAY_ALL outside the transport
modules themselves, so we can safely get rid of it.

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

include/linux/sunrpc/xprt.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ enum rpc_display_format_t { 
	RPC_DISPLAY_ADDR = 0,

	RPC_DISPLAY_PORT,

	RPC_DISPLAY_PROTO,

	RPC_DISPLAY_ALL,

	RPC_DISPLAY_HEX_ADDR,

	RPC_DISPLAY_HEX_PORT,

	RPC_DISPLAY_NETID,

net/sunrpc/xprtrdma/transport.c

+0 −5
Original line number Diff line number Diff line
@@ -181,11 +181,6 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt) 


	xprt->address_strings[RPC_DISPLAY_PROTO] = "rdma";



	(void)snprintf(buf, sizeof(buf), "addr=%s port=%s proto=rdma",

			xprt->address_strings[RPC_DISPLAY_ADDR],

			xprt->address_strings[RPC_DISPLAY_PORT]);

	xprt->address_strings[RPC_DISPLAY_ALL] = kstrdup(buf, GFP_KERNEL);



	(void)snprintf(buf, sizeof(buf), "%02x%02x%02x%02x",

				NIPQUAD(sin->sin_addr.s_addr));

	xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = kstrdup(buf, GFP_KERNEL);

net/sunrpc/xprtsock.c

+34 −16
Original line number Diff line number Diff line
@@ -307,12 +307,6 @@ static void xs_format_common_peer_addresses(struct rpc_xprt *xprt) 
	(void)snprintf(buf, sizeof(buf), "%u", rpc_get_port(sap));

	xprt->address_strings[RPC_DISPLAY_PORT] = kstrdup(buf, GFP_KERNEL);



	(void)snprintf(buf, sizeof(buf), "addr=%s port=%s proto=%s",

			xprt->address_strings[RPC_DISPLAY_ADDR],

			xprt->address_strings[RPC_DISPLAY_PORT],

			xprt->address_strings[RPC_DISPLAY_PROTO]);

	xprt->address_strings[RPC_DISPLAY_ALL] = kstrdup(buf, GFP_KERNEL);



	(void)snprintf(buf, sizeof(buf), "%4hx", rpc_get_port(sap));

	xprt->address_strings[RPC_DISPLAY_HEX_PORT] = kstrdup(buf, GFP_KERNEL);

}
@@ -1721,8 +1715,11 @@ static void xs_udp_connect_worker4(struct work_struct *work) 
		goto out;

	}



	dprintk("RPC:       worker connecting xprt %p to address: %s\n",

			xprt, xprt->address_strings[RPC_DISPLAY_ALL]);

	dprintk("RPC:       worker connecting xprt %p via %s to "

				"%s (port %s)\n", xprt,

			xprt->address_strings[RPC_DISPLAY_PROTO],

			xprt->address_strings[RPC_DISPLAY_ADDR],

			xprt->address_strings[RPC_DISPLAY_PORT]);



	xs_udp_finish_connecting(xprt, sock);

	status = 0;
@@ -1763,8 +1760,11 @@ static void xs_udp_connect_worker6(struct work_struct *work) 
		goto out;

	}



	dprintk("RPC:       worker connecting xprt %p to address: %s\n",

			xprt, xprt->address_strings[RPC_DISPLAY_ALL]);

	dprintk("RPC:       worker connecting xprt %p via %s to "

				"%s (port %s)\n", xprt,

			xprt->address_strings[RPC_DISPLAY_PROTO],

			xprt->address_strings[RPC_DISPLAY_ADDR],

			xprt->address_strings[RPC_DISPLAY_PORT]);



	xs_udp_finish_connecting(xprt, sock);

	status = 0;
@@ -1889,8 +1889,11 @@ static void xs_tcp_setup_socket(struct rpc_xprt *xprt, 
			goto out_eagain;

	}



	dprintk("RPC:       worker connecting xprt %p to address: %s\n",

			xprt, xprt->address_strings[RPC_DISPLAY_ALL]);

	dprintk("RPC:       worker connecting xprt %p via %s to "

				"%s (port %s)\n", xprt,

			xprt->address_strings[RPC_DISPLAY_PROTO],

			xprt->address_strings[RPC_DISPLAY_ADDR],

			xprt->address_strings[RPC_DISPLAY_PORT]);



	status = xs_tcp_finish_connecting(xprt, sock);

	dprintk("RPC:       %p connect status %d connected %d sock state %d\n",
@@ -2228,8 +2231,15 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args) 
		return ERR_PTR(-EAFNOSUPPORT);

	}



	dprintk("RPC:       set up transport to address %s\n",

			xprt->address_strings[RPC_DISPLAY_ALL]);

	if (xprt_bound(xprt))

		dprintk("RPC:       set up xprt to %s (port %s) via %s\n",

				xprt->address_strings[RPC_DISPLAY_ADDR],

				xprt->address_strings[RPC_DISPLAY_PORT],

				xprt->address_strings[RPC_DISPLAY_PROTO]);

	else

		dprintk("RPC:       set up xprt to %s (autobind) via %s\n",

				xprt->address_strings[RPC_DISPLAY_ADDR],

				xprt->address_strings[RPC_DISPLAY_PROTO]);



	if (try_module_get(THIS_MODULE))

		return xprt;
@@ -2293,8 +2303,16 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) 
		return ERR_PTR(-EAFNOSUPPORT);

	}



	dprintk("RPC:       set up transport to address %s\n",

			xprt->address_strings[RPC_DISPLAY_ALL]);

	if (xprt_bound(xprt))

		dprintk("RPC:       set up xprt to %s (port %s) via %s\n",

				xprt->address_strings[RPC_DISPLAY_ADDR],

				xprt->address_strings[RPC_DISPLAY_PORT],

				xprt->address_strings[RPC_DISPLAY_PROTO]);

	else

		dprintk("RPC:       set up xprt to %s (autobind) via %s\n",

				xprt->address_strings[RPC_DISPLAY_ADDR],

				xprt->address_strings[RPC_DISPLAY_PROTO]);





	if (try_module_get(THIS_MODULE))

		return xprt;