aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-29 15:52:50 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-29 15:52:50 -0400
commit5b095d98928fdb9e3b75be20a54b7a6cbf6ca9ad (patch)
treeb6caa0cdbaac016447a790881ad4a6c5dfce6900 /net/sunrpc
parent4b7a4274ca63dadd9c4f17fc953f3a5d19855c4c (diff)
net: replace %p6 with %pI6
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/clnt.c2
-rw-r--r--net/sunrpc/rpcb_clnt.c2
-rw-r--r--net/sunrpc/svcauth_unix.c4
-rw-r--r--net/sunrpc/xprtsock.c8
4 files changed, 8 insertions, 8 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 26f61fd11eab..8f067497c212 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -278,7 +278,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
278 case AF_INET6: { 278 case AF_INET6: {
279 struct sockaddr_in6 *sin = 279 struct sockaddr_in6 *sin =
280 (struct sockaddr_in6 *)args->address; 280 (struct sockaddr_in6 *)args->address;
281 snprintf(servername, sizeof(servername), "%p6", 281 snprintf(servername, sizeof(servername), "%pI6",
282 &sin->sin6_addr); 282 &sin->sin6_addr);
283 break; 283 break;
284 } 284 }
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 968ec1f66bc3..4c8adadc214d 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -305,7 +305,7 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
305 snprintf(buf, sizeof(buf), "::.%u.%u", 305 snprintf(buf, sizeof(buf), "::.%u.%u",
306 port >> 8, port & 0xff); 306 port >> 8, port & 0xff);
307 else 307 else
308 snprintf(buf, sizeof(buf), "%p6.%u.%u", 308 snprintf(buf, sizeof(buf), "%pI6.%u.%u",
309 &address_to_register->sin6_addr, 309 &address_to_register->sin6_addr,
310 port >> 8, port & 0xff); 310 port >> 8, port & 0xff);
311 map->r_addr = buf; 311 map->r_addr = buf;
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index eb640c1a1bc9..16f714a247bc 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -168,7 +168,7 @@ static void ip_map_request(struct cache_detail *cd,
168 ntohl(im->m_addr.s6_addr32[3]) >> 8 & 0xff, 168 ntohl(im->m_addr.s6_addr32[3]) >> 8 & 0xff,
169 ntohl(im->m_addr.s6_addr32[3]) >> 0 & 0xff); 169 ntohl(im->m_addr.s6_addr32[3]) >> 0 & 0xff);
170 } else { 170 } else {
171 snprintf(text_addr, 40, "%p6", &im->m_addr); 171 snprintf(text_addr, 40, "%pI6", &im->m_addr);
172 } 172 }
173 qword_add(bpp, blen, im->m_class); 173 qword_add(bpp, blen, im->m_class);
174 qword_add(bpp, blen, text_addr); 174 qword_add(bpp, blen, text_addr);
@@ -286,7 +286,7 @@ static int ip_map_show(struct seq_file *m,
286 ntohl(addr.s6_addr32[3]) >> 0 & 0xff, 286 ntohl(addr.s6_addr32[3]) >> 0 & 0xff,
287 dom); 287 dom);
288 } else { 288 } else {
289 seq_printf(m, "%s %p6 %s\n", im->m_class, &addr, dom); 289 seq_printf(m, "%s %pI6 %s\n", im->m_class, &addr, dom);
290 } 290 }
291 return 0; 291 return 0;
292} 292}
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 3c9aff584579..f9ce3c9949d5 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -341,7 +341,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
341 341
342 buf = kzalloc(40, GFP_KERNEL); 342 buf = kzalloc(40, GFP_KERNEL);
343 if (buf) { 343 if (buf) {
344 snprintf(buf, 40, "%p6",&addr->sin6_addr); 344 snprintf(buf, 40, "%pI6",&addr->sin6_addr);
345 } 345 }
346 xprt->address_strings[RPC_DISPLAY_ADDR] = buf; 346 xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
347 347
@@ -356,7 +356,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
356 356
357 buf = kzalloc(64, GFP_KERNEL); 357 buf = kzalloc(64, GFP_KERNEL);
358 if (buf) { 358 if (buf) {
359 snprintf(buf, 64, "addr=%p6 port=%u proto=%s", 359 snprintf(buf, 64, "addr=%pI6 port=%u proto=%s",
360 &addr->sin6_addr, 360 &addr->sin6_addr,
361 ntohs(addr->sin6_port), 361 ntohs(addr->sin6_port),
362 protocol); 362 protocol);
@@ -378,7 +378,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
378 378
379 buf = kzalloc(50, GFP_KERNEL); 379 buf = kzalloc(50, GFP_KERNEL);
380 if (buf) { 380 if (buf) {
381 snprintf(buf, 50, "%p6.%u.%u", 381 snprintf(buf, 50, "%pI6.%u.%u",
382 &addr->sin6_addr, 382 &addr->sin6_addr,
383 ntohs(addr->sin6_port) >> 8, 383 ntohs(addr->sin6_port) >> 8,
384 ntohs(addr->sin6_port) & 0xff); 384 ntohs(addr->sin6_port) & 0xff);
@@ -1407,7 +1407,7 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock)
1407 if (port > last) 1407 if (port > last)
1408 nloop++; 1408 nloop++;
1409 } while (err == -EADDRINUSE && nloop != 2); 1409 } while (err == -EADDRINUSE && nloop != 2);
1410 dprintk("RPC: xs_bind6 %p6:%u: %s (%d)\n", 1410 dprintk("RPC: xs_bind6 %pI6:%u: %s (%d)\n",
1411 &myaddr.sin6_addr, port, err ? "failed" : "ok", err); 1411 &myaddr.sin6_addr, port, err ? "failed" : "ok", err);
1412 return err; 1412 return err;
1413} 1413}