Re: [PATCH resend] net/sunrpc: Remove uses of NIPQUAD, use %pI4

Chuck Lever
2010-03-08T15:48:33Z

On 03/06/2010 01:46 AM, Joe Perches wrote:
> Originally submitted Jan 1, 2010
> http://patchwork.kernel.org/patch/71221/
>
> Convert NIPQUAD to the %pI4 format extension where possible
> Convert %02x%02x%02x%02x/NIPQUAD to %08x/ntohl
>
> Signed-off-by: Joe Perches<joe@perches.com>
> ---
> net/sunrpc/xprtrdma/transport.c | 3 +--
> net/sunrpc/xprtsock.c | 5 ++---
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
> index 7018eef..83d339f 100644
> --- a/net/sunrpc/xprtrdma/transport.c
> +++ b/net/sunrpc/xprtrdma/transport.c
> @@ -165,8 +165,7 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt)
>
> xprt->address_strings[RPC_DISPLAY_PROTO] = "rdma";
>
> - (void)snprintf(buf, sizeof(buf), "%02x%02x%02x%02x",
> - NIPQUAD(sin->sin_addr.s_addr));
> + (void)snprintf(buf, sizeof(buf), "%08x", ntohl(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));
> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> index 3d739e5..86234bc 100644
> --- a/net/sunrpc/xprtsock.c
> +++ b/net/sunrpc/xprtsock.c
> @@ -297,12 +297,11 @@ static void xs_format_common_peer_addresses(struct rpc_xprt *xprt)
> switch (sap->sa_family) {
> case AF_INET:
> sin = xs_addr_in(xprt);
> - (void)snprintf(buf, sizeof(buf), "%02x%02x%02x%02x",
> - NIPQUAD(sin->sin_addr.s_addr));
> + snprintf(buf, sizeof(buf), "%08x", ntohl(sin->sin_addr.s_addr));
> break;
> case AF_INET6:
> sin6 = xs_addr_in6(xprt);
> - (void)snprintf(buf, sizeof(buf), "%pi6",&sin6->sin6_addr);
> + snprintf(buf, sizeof(buf), "%pi6",&sin6->sin6_addr);

Why remove the (void) here, but not in xprtrdma/transport.c? IMO the
(void) cast should be left in place at all three call sites.

> break;
> default:
> BUG();
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
chuck[dot]lever[at]oracle[dot]com