SUNRPC: Use rpc_ntop() for constructing transport address strings

[linux-2.6-block.git] / net / sunrpc / xprtrdma / transport.c

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 9839c3d94145d4b154c71ac754f65f9a52239f63..5f9b8676b6bd2b35933a53f11a950333fef77035 100644 (file)
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -168,47 +168,30 @@ static struct rpc_xprt_ops xprt_rdma_procs;       /* forward reference */
 static void
 xprt_rdma_format_addresses(struct rpc_xprt *xprt)
 {
-       struct sockaddr_in *addr = (struct sockaddr_in *)
+       struct sockaddr *sap = (struct sockaddr *)
                                        &rpcx_to_rdmad(xprt).addr;
-       char *buf;
+       struct sockaddr_in *sin = (struct sockaddr_in *)sap;
+       char buf[64];
 
-       buf = kzalloc(20, GFP_KERNEL);
-       if (buf)
-               snprintf(buf, 20, NIPQUAD_FMT, NIPQUAD(addr->sin_addr.s_addr));
-       xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
+       (void)rpc_ntop(sap, buf, sizeof(buf));
+       xprt->address_strings[RPC_DISPLAY_ADDR] = kstrdup(buf, GFP_KERNEL);
 
-       buf = kzalloc(8, GFP_KERNEL);
-       if (buf)
-               snprintf(buf, 8, "%u", ntohs(addr->sin_port));
-       xprt->address_strings[RPC_DISPLAY_PORT] = buf;
+       (void)snprintf(buf, sizeof(buf), "%u", rpc_get_port(sap));
+       xprt->address_strings[RPC_DISPLAY_PORT] = kstrdup(buf, GFP_KERNEL);
 
        xprt->address_strings[RPC_DISPLAY_PROTO] = "rdma";
 
-       buf = kzalloc(48, GFP_KERNEL);
-       if (buf)
-               snprintf(buf, 48, "addr="NIPQUAD_FMT" port=%u proto=%s",
-                       NIPQUAD(addr->sin_addr.s_addr),
-                       ntohs(addr->sin_port), "rdma");
-       xprt->address_strings[RPC_DISPLAY_ALL] = buf;
-
-       buf = kzalloc(10, GFP_KERNEL);
-       if (buf)
-               snprintf(buf, 10, "%02x%02x%02x%02x",
-                       NIPQUAD(addr->sin_addr.s_addr));
-       xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = buf;
-
-       buf = kzalloc(8, GFP_KERNEL);
-       if (buf)
-               snprintf(buf, 8, "%4hx", ntohs(addr->sin_port));
-       xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf;
-
-       buf = kzalloc(30, GFP_KERNEL);
-       if (buf)
-               snprintf(buf, 30, NIPQUAD_FMT".%u.%u",
-                       NIPQUAD(addr->sin_addr.s_addr),
-                       ntohs(addr->sin_port) >> 8,
-                       ntohs(addr->sin_port) & 0xff);
-       xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
+       (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);
+
+       (void)snprintf(buf, sizeof(buf), "%4hx", rpc_get_port(sap));
+       xprt->address_strings[RPC_DISPLAY_HEX_PORT] = kstrdup(buf, GFP_KERNEL);
 
        /* netid */
        xprt->address_strings[RPC_DISPLAY_NETID] = "rdma";
@@ -369,8 +352,8 @@ xprt_setup_rdma(struct xprt_create *args)
        if (ntohs(sin->sin_port) != 0)
                xprt_set_bound(xprt);
 
-       dprintk("RPC:       %s: %u.%u.%u.%u:%u\n", __func__,
-                       NIPQUAD(sin->sin_addr.s_addr), ntohs(sin->sin_port));
+       dprintk("RPC:       %s: %pI4:%u\n",
+               __func__, &sin->sin_addr.s_addr, ntohs(sin->sin_port));
 
        /* Set max requests */
        cdata.max_requests = xprt->max_reqs;