[Ocfs2-commits] jlbec commits r2028 - trunk/fs/ocfs2/dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Mar 21 16:53:04 CST 2005
Author: jlbec
Signed-off-by: mfasheh
Date: 2005-03-21 16:53:02 -0600 (Mon, 21 Mar 2005)
New Revision: 2028
Modified:
trunk/fs/ocfs2/dlm/Makefile
trunk/fs/ocfs2/dlm/dlmmod.h
Log:
o Add QUIET to dlm build
Signed-off-by: mfasheh
Modified: trunk/fs/ocfs2/dlm/Makefile
===================================================================
--- trunk/fs/ocfs2/dlm/Makefile 2005-03-21 22:32:38 UTC (rev 2027)
+++ trunk/fs/ocfs2/dlm/Makefile 2005-03-21 22:53:02 UTC (rev 2028)
@@ -17,6 +17,10 @@
EXTRA_CFLAGS += -I$(CLUSTERINC)
+ifneq ($(QUIET),1)
+EXTRA_CFLAGS += -DENABLE_DLMPRINTK
+endif
+
ifeq ($(KERNELRELEASE),)
ifeq ($(KERNEL_26),)
DLMFS_COMPAT := dlmfs_compat.o
Modified: trunk/fs/ocfs2/dlm/dlmmod.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmod.h 2005-03-21 22:32:38 UTC (rev 2027)
+++ trunk/fs/ocfs2/dlm/dlmmod.h 2005-03-21 22:53:02 UTC (rev 2028)
@@ -29,10 +29,7 @@
#include <linux/kref.h>
-// #undef USE_DLMPRINTK
-#define USE_DLMPRINTK 1
-
-#ifndef USE_DLMPRINTK
+#ifndef ENABLE_DLMPRINTK
#define dlmprintk(x, arg...)
#define dlmprintk0(x)
#else
@@ -40,9 +37,12 @@
#define dlmprintk0(x) printk("(dlm:%d)(%s:%d) " x, current->pid, __FUNCTION__, __LINE__)
#endif
+#define dlmerror(x, arg...) printk(KERN_ERR "(dlm:%d)(%s:%d) " x, current->pid, __FUNCTION__, __LINE__, ##arg)
+#define dlmerror0(x) printk(KERN_ERR "(dlm:%d)(%s:%d) " x, current->pid, __FUNCTION__, __LINE__)
+
#define DLM_HB_NODE_DOWN_PRI (0xf000000)
#define DLM_HB_NODE_UP_PRI (0x8000000)
More information about the Ocfs2-commits
mailing list