[Ocfs2-commits] mfasheh commits r773 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-11 20:08:41 -0600 (Thu, 11 Mar 2004)
New Revision: 773

Modified:
   trunk/src/inc/ocfs.h
   trunk/src/proc.c
Log:
* include a patch from Sonic Zhang <sonic.zhang at intel.com>:

        If I turn on memory debugging by "configure --enable-memdebug",
the make process fails. So I revised several code lines in file ocfs.h
and proc.c and generate this patch file.



Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-03-12 00:51:20 UTC (rev 772)
+++ trunk/src/inc/ocfs.h	2004-03-12 02:08:41 UTC (rev 773)
@@ -749,6 +749,8 @@
 #define TEST_NODE_IN_RECOVERY(osb, num)	((osb->recovery_map) & (0x1 << (num)))
 
 #if defined(OCFS_LINUX_MEM_DEBUG)
+void *ocfs_linux_dbg_alloc (int Size, char *file, int line);
+void ocfs_linux_dbg_free (const void *Buffer);
 # define ocfs_malloc(_s)					\
 ({								\
 	void *m = ocfs_linux_dbg_alloc(_s, __FILE__, __LINE__); \
@@ -1183,6 +1185,7 @@
 #define OCFS_DEBUG_LEVEL_STACK         0x00000200
 
 #define OCFS_DEBUG_LEVEL_PRINTK        0x00001000
+#define OCFS_DEBUG_LEVEL_MALLOC        0x00002000
 
 /* Tracing Contexts */
 #define OCFS_DEBUG_CONTEXT_ALLOC       0x00000001	/* alloc.c    */

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-03-12 00:51:20 UTC (rev 772)
+++ trunk/src/proc.c	2004-03-12 02:08:41 UTC (rev 773)
@@ -44,6 +44,7 @@
 static int ocfs_proc_hash_stats (char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_device (char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_nodes (char *page, char **start, off_t off, int count, int *eof, void *data);
+static int ocfs_proc_memallocs (char *page, char **start, off_t off, int count, int *eof, void *data);
 
 /*
  * ocfs_proc_init()