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

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

[Steven French]

[-- Attachment #1: Type: text/plain, Size: 2270 bytes --]



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: sfrench@us.ibm.com


Adrian Bunk <bunk@fs.tum.de>@vger.kernel.org on 10/12/2002 02:23:03 AM

Sent by:    linux-kernel-owner@vger.kernel.org


To:    stevef@smfhome1.austin.rr.com,
       <jfs-discussion@www-124.southbury.usf.ibm.com>
cc:    Kernel Mailing List <linux-kernel@vger.kernel.org>
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
> ============================================
>...
> <stevef@smfhome1.austin.rr.com>:
>   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

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




[-- Attachment #2: cifs-rename-internal-debug-function.patch --]
[-- Type: application/octet-stream, Size: 2821 bytes --]

diff -Nru a/fs/cifs/asn1.c b/fs/cifs/asn1.c
--- a/fs/cifs/asn1.c	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/asn1.c	Sat Oct 12 03:04:46 2002
@@ -458,7 +458,7 @@
 	unsigned int cls, con, tag, oidlen, rc;
 	int use_ntlmssp = FALSE;
 
-	dump_mem(" Received SecBlob ", security_blob, length);
+	/* cifs_dump_mem(" Received SecBlob ", security_blob, length); */
 
 	asn1_open(&ctx, security_blob, length);
 
diff -Nru a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
--- a/fs/cifs/cifs_debug.c	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/cifs_debug.c	Sat Oct 12 03:04:46 2002
@@ -32,7 +32,7 @@
 #include "cifs_debug.h"
 
 void
-dump_mem(char *label, void *data, int length)
+cifs_dump_mem(char *label, void *data, int length)
 {
 	int i, j;
 	int *intptr = data;
diff -Nru a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h
--- a/fs/cifs/cifs_debug.h	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/cifs_debug.h	Sat Oct 12 03:04:46 2002
@@ -23,7 +23,7 @@
 #ifndef _H_CIFS_DEBUG
 #define _H_CIFS_DEBUG
 
-void dump_mem(char *label, void *data, int length);
+void cifs_dump_mem(char *label, void *data, int length);
 extern int traceSMB;		/* flag which enables the function below */
 void dump_smb(struct smb_hdr *, int);
 
diff -Nru a/fs/cifs/connect.c b/fs/cifs/connect.c
--- a/fs/cifs/connect.c	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/connect.c	Sat Oct 12 03:04:46 2002
@@ -168,7 +168,7 @@
 			} else if (temp[0] != (char) 0) {
 				cERROR(1,
 				       ("\nUnknown RFC 1001 frame received not 0x00 nor 0x85"));
-				dump_mem(" Received Data is: ", temp, length);
+				cifs_dump_mem(" Received Data is: ", temp, length);
 				break;
 			} else {
 				if ((length != sizeof (struct smb_hdr) - 1)
@@ -757,8 +757,7 @@
                /* Removed following few lines to not send old style password 
                   hash ever - for better security */
 			   /* toUpper(cifs_sb->local_nls, password_with_pad);
-				   SMBencrypt(password_with_pad, cryptKey,session_key); 
-				   dump_mem("\nCIFS (Samba encrypt): ", session_key,CIFS_SESSION_KEY_SIZE); */
+				   SMBencrypt(password_with_pad, cryptKey,session_key); */
 
 				rc = CIFSSessSetup(xid, pSesInfo,
 						   volume_info.username,
@@ -989,7 +988,6 @@
 
 	rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response,
 			 &bytes_returned, 1);
-	/* dump_mem("\nSessSetup response is: ", smb_buffer_response, 92);*/
 	if (rc) {
 /* rc = map_smb_to_linux_error(smb_buffer_response); now done in SendReceive */
 	} else if ((smb_buffer_response->WordCount == 3)
@@ -1235,7 +1233,6 @@
 
 	rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response,
 			 &bytes_returned, 1);
-	/* dump_mem("\nSessSetup response is: ", smb_buffer_response, 92);  */
 	if (rc) {
 /*    rc = map_smb_to_linux_error(smb_buffer_response);  *//* done in SendReceive now */
 	} else if ((smb_buffer_response->WordCount == 3)