Re: linux-next: cifs tree build failure

Re: linux-next: cifs tree build failure

[Steve French]

I added an ifdef to fs/cifs/connect.c which should address this.

linux-next: cifs tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

Hi Steve,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/cifs/cifsfs.c: In function 'cifs_show_options':
fs/cifs/cifsfs.c:357: error: implicit declaration of function 'cifs_show_address'

Caused by commit 8616e0fc1e27295316f9821a883f0e9fa6f8200f ("cifs: remove
unneeded NULL checks from cifs_show_options").

I have used the cifs tree from next-20090612 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: cifs tree build failure

[Jeff Layton]

[-- Attachment #1: Type: text/plain, Size: 985 bytes --]

On Mon, 15 Jun 2009 13:32:22 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Steve,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> fs/cifs/cifsfs.c: In function 'cifs_show_options':
> fs/cifs/cifsfs.c:357: error: implicit declaration of function 'cifs_show_address'
> 
> Caused by commit 8616e0fc1e27295316f9821a883f0e9fa6f8200f ("cifs: remove
> unneeded NULL checks from cifs_show_options").
> 
> I have used the cifs tree from next-20090612 for today.

My fault. That function gets introduced in a later patch and I had a
bogus call left in here from when I reorganized the series. This
patch should fix it and a typo that got silently fixed in a patch that
hasn't been committed yet.

This patch should fix both. Steve F., let me know if you want me to
respin the series on top of this patch. Note that there's still a
harmless compiler warning that gets fixed in a later patch in the
series.

Thanks,
-- 
Jeff Layton <jlayton@redhat.com>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-cifs-fix-problems-with-earlier-patches.patch --]
[-- Type: text/x-patch, Size: 1466 bytes --]

From c5949e669f4a85c16b3529777f5d550bddea9dd9 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 15 Jun 2009 06:40:23 -0400
Subject: [PATCH] cifs: fix problems with earlier patches

cifs_show_address hasn't been introduced yet, and fix a typo that was
silently fixed by a later patch in the series.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/cifs/cifsfs.c  |    2 --
 fs/cifs/netmisc.c |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 8b31570..4b8ec25 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -354,8 +354,6 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
 	if (tcon->ses->domainName)
 		seq_printf(s, ",domain=%s", tcon->ses->domainName);
 
-	cifs_show_address(s, tcon->ses->server);
-
 	seq_printf(s, ",uid=%d", cifs_sb->mnt_uid);
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
 		seq_printf(s, ",forceuid");
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index 00e6e35..f9a54da 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -166,7 +166,7 @@ int
 cifs_convert_address(char *src, void *dst)
 {
 	struct sockaddr_in *s4 = (struct sockaddr_in *) dst;
-	struct sockaddr_in6 *s6 = (Struct sockaddr_in6 *) dst;
+	struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) dst;
 
 	if (cifs_inet_pton(AF_INET, src, &s4->sin_addr.s_addr)) {
 		s4->sin_family = AF_INET;
-- 
1.6.0.6

Re: linux-next: cifs tree build failure

[Steve French]

Jeff,
I just applied and reviewed your patch 5 (thus modified your patch
slightly before merging).

https://mail.google.com/mail/?shva=1#search/cifs_show_address/121cfb7757cb8e86

On Mon, Jun 15, 2009 at 5:46 AM, Jeff Layton<jlayton@redhat.com> wrote:
> On Mon, 15 Jun 2009 13:32:22 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi Steve,
>>
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>>
>> fs/cifs/cifsfs.c: In function 'cifs_show_options':
>> fs/cifs/cifsfs.c:357: error: implicit declaration of function 'cifs_show_address'
>>
>> Caused by commit 8616e0fc1e27295316f9821a883f0e9fa6f8200f ("cifs: remove
>> unneeded NULL checks from cifs_show_options").
>>
>> I have used the cifs tree from next-20090612 for today.
>
> My fault. That function gets introduced in a later patch and I had a
> bogus call left in here from when I reorganized the series. This
> patch should fix it and a typo that got silently fixed in a patch that
> hasn't been committed yet.
>
> This patch should fix both. Steve F., let me know if you want me to
> respin the series on top of this patch. Note that there's still a
> harmless compiler warning that gets fixed in a later patch in the
> series.
>
> Thanks,
> --
> Jeff Layton <jlayton@redhat.com>
>



-- 
Thanks,

Steve

linux-next: cifs tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

Hi Steve,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/cifs/dir.c: In function 'cifs_lookup':
fs/cifs/dir.c:664: error: dereferencing pointer to incomplete type

Caused by commit 84c63ad9195b37b3de43427c11471a763c3993cc ("[CIFS] Add
support for posix open during lookup") from the cifs tree (probably an
interaction with commit 5ad4e53bd5406ee214ddc5a41f03f779b8b2d526 ("Get
rid of indirect include of fs_struct.h") - now in Linus' tree).

I have used the cifs tree from next-20090409 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: cifs tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 769 bytes --]

Hi Steve,

On Tue, 14 Apr 2009 11:41:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> fs/cifs/dir.c: In function 'cifs_lookup':
> fs/cifs/dir.c:664: error: dereferencing pointer to incomplete type
> 
> Caused by commit 84c63ad9195b37b3de43427c11471a763c3993cc ("[CIFS] Add
> support for posix open during lookup") from the cifs tree (probably an
> interaction with commit 5ad4e53bd5406ee214ddc5a41f03f779b8b2d526 ("Get
> rid of indirect include of fs_struct.h") - now in Linus' tree).
> 
> I have used the cifs tree from next-20090409 for today.

Still there.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: cifs tree build failure

[Steve French]

fixed in cifs-2.6.git

On Tue, Apr 14, 2009 at 9:59 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Steve,
>
> On Tue, 14 Apr 2009 11:41:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>>
>> fs/cifs/dir.c: In function 'cifs_lookup':
>> fs/cifs/dir.c:664: error: dereferencing pointer to incomplete type
>>
>> Caused by commit 84c63ad9195b37b3de43427c11471a763c3993cc ("[CIFS] Add
>> support for posix open during lookup") from the cifs tree (probably an
>> interaction with commit 5ad4e53bd5406ee214ddc5a41f03f779b8b2d526 ("Get
>> rid of indirect include of fs_struct.h") - now in Linus' tree).
>>
>> I have used the cifs tree from next-20090409 for today.
>
> Still there.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>



-- 
Thanks,

Steve

Re: linux-next: cifs tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

Hi Steve,

On Tue, 14 Apr 2009 22:10:48 -0500 Steve French <smfrench@gmail.com> wrote:
>
> fixed in cifs-2.6.git

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: cifs tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

Hi Steve,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/cifs/connect.c: In function 'cifs_mount':
fs/cifs/connect.c:2545: error: 'struct cifs_sb_info' has no member named 'mountdata'

Caused by commit da9e1ebdf6fc4630329afcad11855113ad6023b6 ("Remote DFS
root support").  I will use the cifs tree form next-20090402 (which
really just drops that one commit).

Presumably CONFIG_CIFS_DFS_UPCALL is not defined in my config.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: cifs tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

Hi Steve,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/cifs/file.c: In function 'cifs_fsync':
fs/cifs/file.c:1587: error: 'cifs_sb' undeclared (first use in this function)

Probably caused by commit cdff0d69360ad3b87e4ac019caa73c657cfe9c76
("[CIFS] Add new nostrictsync cifs mount option to avoid slow SMB flush").

I have dropped the cifs tree for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: cifs tree build failure

[Steve French]

Fixed (in cifs-2.6.git)

On Tue, Feb 24, 2009 at 12:56 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Steve,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> fs/cifs/file.c: In function 'cifs_fsync':
> fs/cifs/file.c:1587: error: 'cifs_sb' undeclared (first use in this function)
>
> Probably caused by commit cdff0d69360ad3b87e4ac019caa73c657cfe9c76
> ("[CIFS] Add new nostrictsync cifs mount option to avoid slow SMB flush").
>
> I have dropped the cifs tree for today.
>
> --
> Cheers,
> Stephen Rothwell
>



-- 
Thanks,

Steve

Re: linux-next: cifs tree build failure

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 240 bytes --]

Hi Steve,

On Tue, 24 Feb 2009 08:45:05 -0600 Steve French <smfrench@gmail.com> wrote:
>
> Fixed (in cifs-2.6.git)

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 172 bytes --]

_______________________________________________
linux-cifs-client mailing list
linux-cifs-client@lists.samba.org
https://lists.samba.org/mailman/listinfo/linux-cifs-client

linux-next: cifs tree build failure

[Stephen Rothwell]

Hi Steve,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/cifs/cifsfs.c: In function 'cifs_show_options':
fs/cifs/cifsfs.c:363: error: 'NIP6_FMT' undeclared (first use in this function)
fs/cifs/cifsfs.c:363: error: (Each undeclared identifier is reported only once
fs/cifs/cifsfs.c:363: error: for each function it appears in.)
fs/cifs/cifsfs.c:364: error: implicit declaration of function 'NIP6'

Caused by the interaction of commits
b189db5d299c6824780af5590564ff608adb3dea ("net: remove NIP6(), NIP6_FMT,
NIP6_SEQFMT and final users") from the net tree and
20c4eef4f817ff65337e2fb3f1f5df52eeca09eb ("cifs: display addr and
prefixpath options in /proc/mounts") from the cifs tree.

I have reverted the include/linux/kernel.h part of the net tree patch for
now since the replacement (%p6) is not upstream yet ...

Dave, can you apply the below to the net tree, please.  The old interface
should really not go away until at least the end of the next merge
window ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Dec 2008 13:11:22 +1100
Subject: [PATCH] net: don't remove the NIP6 interfaces yet

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/kernel.h |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index ca9ff64..269df5a 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -372,6 +372,18 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
 	((unsigned char *)&addr)[3]
 #define NIPQUAD_FMT "%u.%u.%u.%u"
 
+#define NIP6(addr) \
+	ntohs((addr).s6_addr16[0]), \
+	ntohs((addr).s6_addr16[1]), \
+	ntohs((addr).s6_addr16[2]), \
+	ntohs((addr).s6_addr16[3]), \
+	ntohs((addr).s6_addr16[4]), \
+	ntohs((addr).s6_addr16[5]), \
+	ntohs((addr).s6_addr16[6]), \
+	ntohs((addr).s6_addr16[7])
+#define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
+#define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x"
+
 #if defined(__LITTLE_ENDIAN)
 #define HIPQUAD(addr) \
 	((unsigned char *)&addr)[3], \
-- 
1.5.6.5

Re: linux-next: cifs tree build failure

[Stephen Rothwell]

Hi Steve, Dave,

On Tue, 2 Dec 2008 13:23:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> fs/cifs/cifsfs.c: In function 'cifs_show_options':
> fs/cifs/cifsfs.c:363: error: 'NIP6_FMT' undeclared (first use in this function)
> fs/cifs/cifsfs.c:363: error: (Each undeclared identifier is reported only once
> fs/cifs/cifsfs.c:363: error: for each function it appears in.)
> fs/cifs/cifsfs.c:364: error: implicit declaration of function 'NIP6'
> 
> Caused by the interaction of commits
> b189db5d299c6824780af5590564ff608adb3dea ("net: remove NIP6(), NIP6_FMT,
> NIP6_SEQFMT and final users") from the net tree and
> 20c4eef4f817ff65337e2fb3f1f5df52eeca09eb ("cifs: display addr and
> prefixpath options in /proc/mounts") from the cifs tree.

Today I have fixed this by applying a merge fix patch (see below) and
will carry this as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Dec 2008 13:49:23 +1100
Subject: [PATCH] cifs: update for new IP4/6 address printing

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/cifs/cifsfs.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 061a1dc..1b09330 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -362,12 +362,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;
 					}
 				}
-- 
1.5.6.5

Re: linux-next: cifs tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Dec 2008 13:53:12 +1100

> Hi Steve, Dave,
> 
> On Tue, 2 Dec 2008 13:23:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > fs/cifs/cifsfs.c: In function 'cifs_show_options':
> > fs/cifs/cifsfs.c:363: error: 'NIP6_FMT' undeclared (first use in this function)
> > fs/cifs/cifsfs.c:363: error: (Each undeclared identifier is reported only once
> > fs/cifs/cifsfs.c:363: error: for each function it appears in.)
> > fs/cifs/cifsfs.c:364: error: implicit declaration of function 'NIP6'
> > 
> > Caused by the interaction of commits
> > b189db5d299c6824780af5590564ff608adb3dea ("net: remove NIP6(), NIP6_FMT,
> > NIP6_SEQFMT and final users") from the net tree and
> > 20c4eef4f817ff65337e2fb3f1f5df52eeca09eb ("cifs: display addr and
> > prefixpath options in /proc/mounts") from the cifs tree.
> 
> Today I have fixed this by applying a merge fix patch (see below) and
> will carry this as necessary.

Looks good, thanks Stephen.

Re: linux-next: cifs tree build failure

[Jeff Layton]

On Tue, 02 Dec 2008 19:19:25 -0800 (PST)
David Miller <davem@davemloft.net> wrote:

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 3 Dec 2008 13:53:12 +1100
> 
> > Hi Steve, Dave,
> > 
> > On Tue, 2 Dec 2008 13:23:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > > 
> > > fs/cifs/cifsfs.c: In function 'cifs_show_options':
> > > fs/cifs/cifsfs.c:363: error: 'NIP6_FMT' undeclared (first use in this function)
> > > fs/cifs/cifsfs.c:363: error: (Each undeclared identifier is reported only once
> > > fs/cifs/cifsfs.c:363: error: for each function it appears in.)
> > > fs/cifs/cifsfs.c:364: error: implicit declaration of function 'NIP6'
> > > 
> > > Caused by the interaction of commits
> > > b189db5d299c6824780af5590564ff608adb3dea ("net: remove NIP6(), NIP6_FMT,
> > > NIP6_SEQFMT and final users") from the net tree and
> > > 20c4eef4f817ff65337e2fb3f1f5df52eeca09eb ("cifs: display addr and
> > > prefixpath options in /proc/mounts") from the cifs tree.
> > 
> > Today I have fixed this by applying a merge fix patch (see below) and
> > will carry this as necessary.
> 
> Looks good, thanks Stephen.

Looks good to me too -- I don't think we have any more changes in the
CIFS ipv6 address formatting code coming too soon...

Still, is there some reason that NIP6/NIPQUAD stuff needs to be removed
at the same time as we add %pI4/%pI6? An period where the old NIP*
defines still live in the tree seems like a reasonable thing.

-- 
Jeff Layton <jlayton@redhat.com>

Re: linux-next: cifs tree build failure

[David Miller]

From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 3 Dec 2008 06:57:21 -0500

> Still, is there some reason that NIP6/NIPQUAD stuff needs to be removed
> at the same time as we add %pI4/%pI6? An period where the old NIP*
> defines still live in the tree seems like a reasonable thing.

Actually, from my perspective, killing the macros turns out to
be a good thing.  It caught a potential revert of the conversion
we did in CIFS already, for example :)

Unlike a compile failure, we don't have some automated thing
scanning new patches looking for references to turds like these
NIPQUAD macros which we want to remove.

Re: linux-next: cifs tree build failure

[Stephen Rothwell]

Hi Steve,

On Wed, 3 Dec 2008 13:53:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today I have fixed this by applying a merge fix patch (see below) and
> will carry this as necessary.

An even better fix (as far as I am concerned) would be for you to pull
the net tree into the cifs tree (since the net tree will *never* rebase,
this is safe) and then apply the following two fixups as part of the
merge.  Or if you want to rebase the cifs tree, then use a merge of
Linus' tree and the net tree as the base and fix up the relevent commits
with the following.

That way, I don't have to carry these fixups ...  I have had to reapply
the fist once already as things continue to change.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc fs/cifs/connect.c
index 204bd13,3519420..0000000
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@@ -2228,8 -2269,12 +2269,12 @@@ cifs_mount(struct super_block *sb, stru
  
  		/* new SMB session uses our srvTcp ref */
  		pSesInfo->server = srvTcp;
- 		sprintf(pSesInfo->serverName, "%pI4",
- 			&sin_server->sin_addr.s_addr);
+ 		if (srvTcp->addr.sockAddr6.sin6_family == AF_INET6)
 -			sprintf(pSesInfo->serverName, NIP6_FMT,
 -				NIP6(srvTcp->addr.sockAddr6.sin6_addr));
++			sprintf(pSesInfo->serverName, "%pI6",
++				&srvTcp->addr.sockAddr6.sin6_addr);
+ 		else
 -			sprintf(pSesInfo->serverName, NIPQUAD_FMT,
 -				NIPQUAD(srvTcp->addr.sockAddr.sin_addr.s_addr));
++			sprintf(pSesInfo->serverName, "%pI4",
++				&srvTcp->addr.sockAddr.sin_addr.s_addr);
  
  		write_lock(&cifs_tcp_ses_lock);
  		list_add(&pSesInfo->smb_ses_list, &srvTcp->smb_ses_list);

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 061a1dc..1b09330 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -362,12 +362,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;
 					}
 				}