Commit 017cb47f authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

SUNRPC: Clean up one_sock_name() 



Clean up svc_one_sock_name() by setting up automatic variables for
frequently used expressions.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 58de2f86

net/sunrpc/svcsock.c

+11 −10
Original line number Diff line number Diff line
@@ -242,26 +242,27 @@ static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr) 
 */

static int svc_one_sock_name(struct svc_sock *svsk, char *buf, int remaining)

{

	const struct sock *sk = svsk->sk_sk;

	const char *proto_name = sk->sk_protocol == IPPROTO_UDP ?

							"udp" : "tcp";

	int len;



	switch(svsk->sk_sk->sk_family) {

	switch (sk->sk_family) {

	case PF_INET:

		len = snprintf(buf, remaining, "ipv4 %s %pI4 %d\n",

			      svsk->sk_sk->sk_protocol == IPPROTO_UDP ?

			      "udp" : "tcp",

			      &inet_sk(svsk->sk_sk)->rcv_saddr,

			      inet_sk(svsk->sk_sk)->num);

				proto_name,

				&inet_sk(sk)->rcv_saddr,

				inet_sk(sk)->num);

		break;

	case PF_INET6:

		len = snprintf(buf, remaining, "ipv6 %s %pI6 %d\n",

				svsk->sk_sk->sk_protocol == IPPROTO_UDP ?

				"udp" : "tcp",

				&inet6_sk(svsk->sk_sk)->rcv_saddr,

				inet_sk(svsk->sk_sk)->num);

				proto_name,

				&inet6_sk(sk)->rcv_saddr,

				inet_sk(sk)->num);

		break;

	default:

		len = snprintf(buf, remaining, "*unknown-%d*\n",

			       svsk->sk_sk->sk_family);

				sk->sk_family);

	}



	if (len >= remaining) {