[Ocfs2-commits] mfasheh commits r2165 - trunk/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-04-22 13:37:04 -0500 (Fri, 22 Apr 2005)
New Revision: 2165

Modified:
   trunk/fs/ocfs2/cluster/Makefile
   trunk/fs/ocfs2/cluster/nodemanager.c
Log:
* Just remove nmprintk, it was used only once. When required we can pull in 
  the masklog header.

Signed-off-by: zab



Modified: trunk/fs/ocfs2/cluster/Makefile
===================================================================
--- trunk/fs/ocfs2/cluster/Makefile	2005-04-22 18:32:35 UTC (rev 2164)
+++ trunk/fs/ocfs2/cluster/Makefile	2005-04-22 18:37:04 UTC (rev 2165)
@@ -26,10 +26,6 @@
 # XXX should be folded into the kapi stuff
 EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/configfs/compatinclude
 
-ifneq ($(QUIET),1)
-EXTRA_CFLAGS += -DENABLE_NMPRINTK
-endif
-
 #
 # For OCFS2, SOURCES+HEADERS live even in kbuild-26 because they
 # are needed for VERSION_FILES

Modified: trunk/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.c	2005-04-22 18:32:35 UTC (rev 2164)
+++ trunk/fs/ocfs2/cluster/nodemanager.c	2005-04-22 18:37:04 UTC (rev 2165)
@@ -67,23 +67,11 @@
 
 #include "configfs.h"
 
-#ifndef __user
-#define __user
-#endif
-
 /* for now we operate under the assertion that there can be only one
  * cluster active at a time.  Changing this will require trickling
  * cluster references throughout where nodes are looked up */
 static struct nm_cluster *nm_single_cluster = NULL;
 
-#ifndef ENABLE_NMPRINTK
-#define nmprintk(x, arg...)
-#define nmprintk0(x)
-#else
-#define nmprintk(x, arg...)    printk("(nm:%d) " x, current->pid, ##arg)
-#define nmprintk0(x)           printk("(nm:%d) " x, current->pid)
-#endif
-
 static char ocfs2_hb_ctl_path[PATH_MAX] = "/sbin/ocfs2_hb_ctl";
 
 static ctl_table ocfs2_nm_table[] = {
@@ -771,8 +759,6 @@
 
 static void __exit exit_nm(void)
 {
-	nmprintk("unloading nm module\n");
-
 	if (ocfs2_table_header)
 		unregister_sysctl_table(ocfs2_table_header);