From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Dec 2008 02:49:23 +0000 (+1100)
Subject: cifs: update for new IP4/6 address printing
X-Git-Tag: v2.6.29-rc1~576
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bf66542bef3771a42ad3b1d5dc503c804bc22b33;p=linux-2.6-omap-h63xx.git

cifs: update for new IP4/6 address printing

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 974c8f0e615..0005a194a75 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -361,12 +361,12 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
 					switch (server->addr.sockAddr6.
 						sin6_family) {
 					case AF_INET6:
-						seq_printf(s, NIP6_FMT,
-							   NIP6(server->addr.sockAddr6.sin6_addr));
+						seq_printf(s, "%pI6",
+							   &server->addr.sockAddr6.sin6_addr);
 						break;
 					case AF_INET:
-						seq_printf(s, NIPQUAD_FMT,
-							   NIPQUAD(server->addr.sockAddr.sin_addr.s_addr));
+						seq_printf(s, "%pI4",
+							   &server->addr.sockAddr.sin_addr.s_addr);
 						break;
 					}
 				}