From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steve French <smfrench@gmail•com>, linux-cifs-client@lists•samba.org
Cc: linux-next@vger•kernel.org,
Harvey Harrison <harvey.harrison@gmail•com>,
"David S. Miller" <davem@davemloft•net>,
Jeff Layton <jlayton@redhat•com>
Subject: Re: linux-next: cifs tree build failure
Date: Wed, 3 Dec 2008 13:53:12 +1100 [thread overview]
Message-ID: <20081203135312.60d4518d.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081202132318.7e1581db.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2008-12-03 2:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-02 2:23 linux-next: cifs tree build failure Stephen Rothwell
2008-12-03 2:53 ` Stephen Rothwell [this message]
2008-12-03 3:19 ` David Miller
2008-12-03 11:57 ` Jeff Layton
2008-12-03 20:40 ` David Miller
2008-12-12 3:32 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-02-24 6:56 Stephen Rothwell
2009-02-24 14:45 ` Steve French
2009-02-25 3:03 ` Stephen Rothwell
2009-04-03 2:07 Stephen Rothwell
2009-04-03 3:31 Steve French
2009-04-14 1:41 Stephen Rothwell
2009-04-15 2:59 ` Stephen Rothwell
2009-04-15 3:10 ` Steve French
2009-04-15 3:20 ` Stephen Rothwell
2009-06-15 3:32 Stephen Rothwell
2009-06-15 10:46 ` Jeff Layton
2009-06-15 13:47 ` Steve French
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081203135312.60d4518d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=harvey.harrison@gmail$(echo .)com \
--cc=jlayton@redhat$(echo .)com \
--cc=linux-cifs-client@lists$(echo .)samba.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=smfrench@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox