aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-28 19:06:44 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-28 19:06:44 -0400
commit1afa67f5e70b4733d5b237df61e6d639af6283bb (patch)
tree34912ebf8e13c40e00bc5ab13c365a5556d684ca /fs
parentb071195deba14b37ce896c26f20349b46e5f9fd2 (diff)
misc: replace NIP6_FMT with %p6 format specifier
The iscsi_ibft.c changes are almost certainly a bugfix as the pointer 'ip' is a u8 *, so they never print the last 8 bytes of the IPv6 address, and the eight bytes they do print have a zero byte with them in each 16-bit word. Other than that, this should cause no difference in functionality. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/lockd/host.c2
-rw-r--r--fs/nfs/super.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 9fd8889097b7..344e6b475e05 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -122,7 +122,7 @@ static void nlm_display_address(const struct sockaddr *sap,
122 snprintf(buf, len, NIPQUAD_FMT, 122 snprintf(buf, len, NIPQUAD_FMT,
123 NIPQUAD(sin6->sin6_addr.s6_addr32[3])); 123 NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
124 else 124 else
125 snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr)); 125 snprintf(buf, len, "%p6", &sin6->sin6_addr);
126 break; 126 break;
127 default: 127 default:
128 snprintf(buf, len, "unsupported address family"); 128 snprintf(buf, len, "unsupported address family");
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f48db679a1c6..5fe77219df78 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -468,8 +468,7 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
468 } 468 }
469 case AF_INET6: { 469 case AF_INET6: {
470 struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap; 470 struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
471 seq_printf(m, ",mountaddr=" NIP6_FMT, 471 seq_printf(m, ",mountaddr=%p6", &sin6->sin6_addr);
472 NIP6(sin6->sin6_addr));
473 break; 472 break;
474 } 473 }
475 default: 474 default: