net/sunrpc: remove uses of NIPQUAD, use %pI4
Subsystems (3)
PATCH 2/2 net/sunrpc: remove uses of NIPQUAD, use %pI4
From: Joe Perches <[email protected]>
Signed-off-by Joe Perches <[email protected]>
Cc J. Bruce Fields <[email protected]>
Cc Neil Brown <[email protected]>
Cc Trond Myklebust <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
net/sunrpc/xprtrdma/transport.c | 3 +-- net/sunrpc/xprtsock.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-)
net/sunrpc/xprtrdma/transport.c renamed from net/sunrpc/xprtrdma/transport.c~net-sunrpc-remove-uses-of-nipquad-use-%pi4 +1 -2
@@ -165,8 +165,7 @@ xprt_rdma_format_addresses(struct rpc_xp 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));
net/sunrpc/xprtsock.c renamed from net/sunrpc/xprtsock.c~net-sunrpc-remove-uses-of-nipquad-use-%pi4 +2 -3
@@ -297,12 +297,11 @@ static void xs_format_common_peer_addresswitch (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);break ;default :BUG ();
_