SUNRPC: Remove duplicate universal address generation

RPC universal address generation is currently done in several places:
rpcb_clnt.c, nfs4proc.c xprtsock.c, and xprtrdma.c.  Remove the
redundant cases that convert a socket address to a universal
address.  The nfs4proc.c case takes a pre-formatted presentation
address string, not a socket address, so we'll leave that one.

Because the new uaddr constructor uses the recently introduced
rpc_ntop(), it now supports proper "::" shorthanding for IPv6
addresses.  This allows the kernel to register properly formed
universal addresses with the local rpcbind service, in _all_ cases.

The kernel can now also send properly formed universal addresses in
RPCB_GETADDR requests, and support link-local properly when
encoding and decoding IPv6 addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 0 insertions, 18 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 83c73c4d017a..a42c2adda59f 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -341,15 +341,6 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt,
         }
         xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf;
 
-        buf = kzalloc(30, GFP_KERNEL);
-        if (buf) {
-                snprintf(buf, 30, "%pI4.%u.%u",
-                                &addr->sin_addr.s_addr,
-                                ntohs(addr->sin_port) >> 8,
-                                ntohs(addr->sin_port) & 0xff);
-        }
-        xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
-
         xprt->address_strings[RPC_DISPLAY_NETID] = netid;
 }
 
@@ -397,15 +388,6 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
         }
         xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf;
 
-        buf = kzalloc(50, GFP_KERNEL);
-        if (buf) {
-                snprintf(buf, 50, "%pI6.%u.%u",
-                         &addr->sin6_addr,
-                         ntohs(addr->sin6_port) >> 8,
-                         ntohs(addr->sin6_port) & 0xff);
-        }
-        xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
-
         xprt->address_strings[RPC_DISPLAY_NETID] = netid;
 }