diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 03:54:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:54:56 -0400 |
commit | 21454aaad30651ba0dcc16fe5271bc12ee21f132 (patch) | |
tree | eb525494d6f80a0e855840bc588ae1f422348b04 /net/sunrpc/xprtrdma/transport.c | |
parent | 14d5e834f6b36667c7da56374645f99b6cf30814 (diff) |
net: replace NIPQUAD() in net/*/
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/xprtrdma/transport.c')
-rw-r--r-- | net/sunrpc/xprtrdma/transport.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 9839c3d9414..1dd6123070e 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c | |||
@@ -174,7 +174,7 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt) | |||
174 | 174 | ||
175 | buf = kzalloc(20, GFP_KERNEL); | 175 | buf = kzalloc(20, GFP_KERNEL); |
176 | if (buf) | 176 | if (buf) |
177 | snprintf(buf, 20, NIPQUAD_FMT, NIPQUAD(addr->sin_addr.s_addr)); | 177 | snprintf(buf, 20, "%pI4", &addr->sin_addr.s_addr); |
178 | xprt->address_strings[RPC_DISPLAY_ADDR] = buf; | 178 | xprt->address_strings[RPC_DISPLAY_ADDR] = buf; |
179 | 179 | ||
180 | buf = kzalloc(8, GFP_KERNEL); | 180 | buf = kzalloc(8, GFP_KERNEL); |
@@ -186,8 +186,8 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt) | |||
186 | 186 | ||
187 | buf = kzalloc(48, GFP_KERNEL); | 187 | buf = kzalloc(48, GFP_KERNEL); |
188 | if (buf) | 188 | if (buf) |
189 | snprintf(buf, 48, "addr="NIPQUAD_FMT" port=%u proto=%s", | 189 | snprintf(buf, 48, "addr=%pI4 port=%u proto=%s", |
190 | NIPQUAD(addr->sin_addr.s_addr), | 190 | &addr->sin_addr.s_addr, |
191 | ntohs(addr->sin_port), "rdma"); | 191 | ntohs(addr->sin_port), "rdma"); |
192 | xprt->address_strings[RPC_DISPLAY_ALL] = buf; | 192 | xprt->address_strings[RPC_DISPLAY_ALL] = buf; |
193 | 193 | ||
@@ -204,8 +204,8 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt) | |||
204 | 204 | ||
205 | buf = kzalloc(30, GFP_KERNEL); | 205 | buf = kzalloc(30, GFP_KERNEL); |
206 | if (buf) | 206 | if (buf) |
207 | snprintf(buf, 30, NIPQUAD_FMT".%u.%u", | 207 | snprintf(buf, 30, "%pI4.%u.%u", |
208 | NIPQUAD(addr->sin_addr.s_addr), | 208 | &addr->sin_addr.s_addr, |
209 | ntohs(addr->sin_port) >> 8, | 209 | ntohs(addr->sin_port) >> 8, |
210 | ntohs(addr->sin_port) & 0xff); | 210 | ntohs(addr->sin_port) & 0xff); |
211 | xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf; | 211 | xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf; |
@@ -369,8 +369,8 @@ xprt_setup_rdma(struct xprt_create *args) | |||
369 | if (ntohs(sin->sin_port) != 0) | 369 | if (ntohs(sin->sin_port) != 0) |
370 | xprt_set_bound(xprt); | 370 | xprt_set_bound(xprt); |
371 | 371 | ||
372 | dprintk("RPC: %s: %u.%u.%u.%u:%u\n", __func__, | 372 | dprintk("RPC: %s: %pI4:%u\n", |
373 | NIPQUAD(sin->sin_addr.s_addr), ntohs(sin->sin_port)); | 373 | __func__, &sin->sin_addr.s_addr, ntohs(sin->sin_port)); |
374 | 374 | ||
375 | /* Set max requests */ | 375 | /* Set max requests */ |
376 | cdata.max_requests = xprt->max_reqs; | 376 | cdata.max_requests = xprt->max_reqs; |