Re: [-mm patch] fs/cifs/cifsproto.h: remove #ifdef around small_smb_init_no_tc() prototype

From: Steven French
Date: Mon Jun 26 2006 - 00:08:25 EST


The equivalent fix should already be merged in now

The missed ifdef removal happened a couple days ago as I turned on the
previously experimental new session establishment code (in
fs/cifs/sess.c) and turn off the older code in fs/cifs/connect.c
(necessary for legacy win9x lanman server support and more secure (ntlmv2)
session establishment support). I have a few relatively minor changes
to make to fs/cifs/sess.c (including changing buffer allocation in a few
places, an ntlmv2 fix for support of one server type) still.


Steve French
Senior Software Engineer
Linux Technology Center - IBM Austin
phone: 512-838-2294
email: sfrench at-sign us dot ibm dot com

Adrian Bunk <bunk@xxxxxxxxx> wrote on 06/25/2006 06:13:29 PM:

> On Sat, Jun 24, 2006 at 06:19:14AM -0700, Andrew Morton wrote:
> >...
> > Changes since 2.6.17-mm1:
> >...
> > +cifs-build-fix.patch
> >
> > Fix git-cifs.patch.
> >...
>
> Let's hope gcc guesses the prototye of the function right.
>
> Otherwise, this patch has turned a compile error into a nasty runtime
> error (in many cases, the stack is garbage).
>
> The -Werror-implicit-function-declaration gcc flag would turn such
> possible problems into compile errors.
>
> This patch removes the (never required) #ifdef from the prototype of
> thie function in fs/cifs/cifsproto.h.
>
> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
>
> --- linux-2.6.17-mm2-full/fs/cifs/cifsproto.h.old 2006-06-26 00:
> 00:56.000000000 +0200
> +++ linux-2.6.17-mm2-full/fs/cifs/cifsproto.h 2006-06-26 00:01:02.
> 000000000 +0200
> @@ -64,11 +64,9 @@
> extern void header_assemble(struct smb_hdr *, char /* command */ ,
> const struct cifsTconInfo *, int /* length of
> fixed section (word count) in two byte units */);
> -#ifdef CONFIG_CIFS_EXPERIMENTAL
> extern int small_smb_init_no_tc(const int smb_cmd, const int wct,
> struct cifsSesInfo *ses,
> void ** request_buf);
> -#endif
> extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
> const int stage,
> const struct nls_table *nls_cp);
>

-
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/