linux-next: origin tree build failure

[Stephen Rothwell]

Hi Steve, Dave,

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

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

Maybe someone should have warned Linus about the below known interaction
between the net tree and the cifs tree ...

I have applied the patch to today's linux-next tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Date: Wed, 3 Dec 2008 13:53:12 +1100
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
To: Steve French <smfrench@xxxxxxxxx>, <linux-cifs-client@xxxxxxxxxxxxxxx>
Cc: linux-next@xxxxxxxxxxxxxxx, Harvey Harrison <harvey.harrison@xxxxxxxxx>,
 "David S. Miller" <davem@xxxxxxxxxxxxx>, Jeff Layton <jlayton@xxxxxxxxxx>
Subject: Re: linux-next: cifs tree build failure
Message-Id: <20081203135312.60d4518d.sfr@xxxxxxxxxxxxxxxx>
In-Reply-To: <20081202132318.7e1581db.sfr@xxxxxxxxxxxxxxxx>
References: <20081202132318.7e1581db.sfr@xxxxxxxxxxxxxxxx>
X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Hi Steve, Dave,

On Tue, 2 Dec 2008 13:23:18 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/