| Message ID | 20090615064618.120a2337@tlielax.poochiereds.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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> >
On Mon, 15 Jun 2009 08:47:12 -0500 Steve French <smfrench@gmail.com> wrote: > 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 > Ok, the last patch (#4) should apply relatively cleanly and will fix up the compiler warning. Let me know when you get that applied and I'll go ahead and push the mount.cifs patch. Thanks,
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