[Ocfs2-commits] mfasheh commits r794 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-19 18:07:14 -0600 (Fri, 19 Mar 2004)
New Revision: 794

Modified:
   trunk/src/dlm.c
Log:
* silence some printk's if QUIET is defined


Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-03-19 20:27:45 UTC (rev 793)
+++ trunk/src/dlm.c	2004-03-20 00:07:14 UTC (rev 794)
@@ -333,7 +333,9 @@
 				if (lockres->readonly_node != OCFS_INVALID_NODE_NUM) {
 					if (lockres->readonly_node == curr_master) {
 						// readonly cachelock already on this dir
+#ifdef VERBOSE_LOCKING_TRACE
 						printk("ocfs_wait_for_lock_release: ronode=master=%d\n", curr_master);
+#endif
 						ocfs_release_lockres(lockres);
 						goto got_it;
 					} else {
@@ -360,10 +362,12 @@
 					}
 					goto finally;
 				}
-			
+
+#ifdef VERBOSE_LOCKING_TRACE
 				printk("waitforlockrelease: setting ronode, was=%d, now=%d\n", lockres->readonly_node, lockres->master_node_num);
+				printk("ocfs_wait_for_lock_release: cache->readonly ronode=master=%d\n", curr_master);
+#endif
 				lockres->readonly_node = lockres->master_node_num;	
-				printk("ocfs_wait_for_lock_release: cache->readonly ronode=master=%d\n", curr_master);
 				ocfs_release_lockres(lockres);
 				goto got_it;
 			} else {
@@ -1320,8 +1324,10 @@
 		if (lockres->master_node_num == osb->node_num &&
 		    lockres->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK) {
 			/* local node is master */
+#ifdef VERBOSE_LOCKING_TRACE
 			printk("acquirelock: setting ronode, was=%d, now=%d, master=%d\n", 
 			       lockres->readonly_node, osb->node_num, lockres->master_node_num);
+#endif
 			lockres->readonly_node = osb->node_num;
 			goto skip_lock_write;
 		}
@@ -1383,10 +1389,11 @@
 	LOG_TRACE_ARGS("lockres: master=%d, locktype=%d, flags: %08x\n",
 		       lockres->master_node_num, lockres->lock_type, flags);
 	
+#ifdef VERBOSE_LOCKING_TRACE
 	printk("lockres: lockid=%u.%u, this=%d, master=%d, locktype=%d, flags=%08x, ronode=%d, romap=%08x\n",
 		       lockres->sector_num, osb->node_num, lockres->master_node_num, lockres->lock_type, flags,
 		       lockres->readonly_node, lockres->readonly_map);
-	
+#endif	
 	if (wait_on_recovery && !(flags & FLAG_FILE_RECOVERY)) {
 		int waitcnt = 0;
 		LOG_TRACE_ARGS("Waiting on node %u to be recovered\n",
@@ -2051,9 +2058,11 @@
 	}
 	
 	/* update the lockres */
+#ifdef VERBOSE_LOCKING_TRACE
 	printk("new_lock_function: set lockid=%u.%u, locktype=%d->%d, master=%d->%d\n",
 	       lockres->sector_num, lockres->lock_type, requested_lock,
 	       lockres->master_node_num, osb->node_num);
+#endif
 	lockres->master_node_num = osb->node_num;
 	lockres->lock_type = requested_lock;