diff -u linux/fs/ocfs/Common/inc/ocfstrace.h-o linux/fs/ocfs/Common/inc/ocfstrace.h
--- linux/fs/ocfs/Common/inc/ocfstrace.h-o	2003-06-16 21:06:38.000000000 +0200
+++ linux/fs/ocfs/Common/inc/ocfstrace.h	2003-06-16 21:12:51.000000000 +0200
@@ -135,17 +135,17 @@
 
 /* TRACE disabled. ERROR macros are never disabled. */
 #if !defined(TRACE)
-# define  LOG_ENTRY()
-# define  LOG_EXIT()
-# define  LOG_EXIT_STATUS(val)			(val)
-# define  LOG_EXIT_LONG(val)			(val)
-# define  LOG_EXIT_ULONG(val)			(val)
-# define  LOG_EXIT_PTR(val)			(val)
-# define  LOG_TRACE_STR(str)
-# define  LOG_TRACE_STATUS(val)			(val)
-# define  LOG_ENTRY_ARGS(fmt, arg...)
-# define  LOG_EXIT_ARGS(fmt, arg...)
-# define  LOG_TRACE_ARGS(fmt, arg...)
+# define  LOG_ENTRY()				do {} while(0)
+# define  LOG_EXIT() 				do {} while(0)
+# define  LOG_EXIT_STATUS(val)			do {} while(0)
+# define  LOG_EXIT_LONG(val)			do {} while(0)
+# define  LOG_EXIT_ULONG(val)			do {} while(0)
+# define  LOG_EXIT_PTR(val)			do {} while(0)
+# define  LOG_TRACE_STR(str)			do {} while(0)
+# define  LOG_TRACE_STATUS(val)			do {} while(0)
+# define  LOG_ENTRY_ARGS(fmt, arg...)		do {} while(0)
+# define  LOG_EXIT_ARGS(fmt, arg...)		do {} while(0)
+# define  LOG_TRACE_ARGS(fmt, arg...)		do {} while(0)
 #endif				/* !defined(TRACE) */
 
 /* TRACE enabled */