2002-10-12 08:11:46

by Steven French

[permalink] [raw]
Subject: Re: [PATCH] rename debug_mem function in CIFS vfs in Linux v2.5.42



Attached is a patch (1.749 at bk://cifs.bkbits.net/linux-2.5-with-cifs) for
renaming the cifs vfs debug function that you noted can conflict in some
cases with a jfs debug function of the same name if jfs debugging is
enabled
(See attached file: cifs-rename-internal-debug-function.patch)
asn1.c | 2 +-
cifs_debug.c | 2 +-
cifs_debug.h | 2 +-
connect.c | 7 ++-----
4 files changed, 5 insertions(+), 8 deletions(-)

Also patch 1.748 which fixes 64 compiler warnings in the cifs vfs and
removes an optional debug function whose name conflicted (print_status) was
also posted to bk://cifs.bkbits.net/linux-2.5-with-cifs earlier today.

Steve French
Senior Software Engineer
Linux Technology Center - IBM Austin
phone: 512-838-2294
email: [email protected]


Adrian Bunk <[email protected]>@vger.kernel.org on 10/12/2002 02:23:03 AM

Sent by: [email protected]


To: [email protected],
<[email protected]>
cc: Kernel Mailing List <[email protected]>
Subject: Re: Linux v2.5.42



On Fri, 11 Oct 2002, Linus Torvalds wrote:

>...
> Summary of changes from v2.5.41 to v2.5.42
> ============================================
>...
> <[email protected]>:
> o Initial check in of cifs filesystem version 0.54 for Linux 2.5 (to
> clean tree as one changeset)
>...


Both jfs and cifs ship a function called `dump_mem' causing the following
compile error when both are included:

<-- snip -->

ld -m elf_i386 -r -o fs/built-in.o ...
fs/jfs/built-in.o: In function `dump_mem':
fs/jfs/built-in.o(.text+0xe420): multiple definition of `dump_mem'
fs/cifs/built-in.o(.text+0x3af0): first defined here
make[1]: *** [fs/built-in.o] Error 1
make: *** [fs] Error 2

<-- snip -->

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed


Attachments:
cifs-rename-internal-debug-function.patch (2.75 kB)