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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-19 19:22:50 -0600 (Fri, 19 Mar 2004)
New Revision: 797

Modified:
   trunk/src/nm.c
Log:
* put some debug #ifdef's around more of the printks in nm.c


Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-03-20 01:20:58 UTC (rev 796)
+++ trunk/src/nm.c	2004-03-20 01:22:50 UTC (rev 797)
@@ -851,10 +851,11 @@
 	       (flags & FLAG_ACQUIRE_LOCK ? "ACQUIRE" : "MODIFY"), lock_id,
 	       process_vote_strings[vote_type], disk_vote ? "disk vote" : "net vote" );
 #endif
+#ifdef VERBOSE_LOCKING_TRACE
 	printk("process_vote: this=%d, master=%d, locktype=%d, flags=%08x, ronode=%d, romap=%08x\n",
 		       osb->node_num, lockres->master_node_num, lockres->lock_type, flags,
 		       lockres->readonly_node, lockres->readonly_map);
-
+#endif
 	/* get_process_vote_action will only allow CHANGE_MASTER, RELEASE_CACHE, and
 	 * ADD_OIN_MAP on a CACHE lock held by this node.  the CHANGE_MASTER/RELEASE_CACHE
 	 * path needs to check the readonly map to see if any nodes need to be updated.  this
@@ -1070,10 +1071,14 @@
 #endif
 #endif
 			}
+#ifdef VERBOSE_LOCKING_TRACE
 			printk("do i need a zap buffers here?\n");
 //			ocfs_break_cache_lock_zap_buffers(osb, inode);
+#endif
 			lockres->readonly_map |= (1 << node_num);
+#ifdef VERBOSE_LOCKING_TRACE
 			printk("READONLY: 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;
 			vote_response = FLAG_VOTE_NODE;
 			status = 0;
@@ -1126,7 +1131,9 @@
 					break;
 				}
 				// noone left in map, so continue
+#ifdef VERBOSE_LOCKING_TRACE
 				printk("noone left in map, so continue...\n");
+#endif
 				lockres->readonly_node = OCFS_INVALID_NODE_NUM;
 			}
 
@@ -1147,7 +1154,9 @@
 
 
 			if (oin != NULL) {
+#ifdef VERBOSE_LOCKING_TRACE
 				printk("setting locktype to nolock\n");
+#endif
 				lockres->lock_type = OCFS_DLM_NO_LOCK;
 				lockres->cache_lock_held = false;
 			}
@@ -1186,7 +1195,9 @@
 					break;
 				}
 				if (vote_type == RELEASE_CACHE) {
+#ifdef VERBOSE_LOCKING_TRACE
 					printk("setting locktype to nolock\n");
+#endif
 					lockres->lock_type = OCFS_DLM_NO_LOCK;
 				}
 				else // CHANGE_MASTER
@@ -1454,8 +1465,6 @@
 			continue;
 		}
 
-		LOG_TRACE_ARGS("node %u recovery: freeing oin->main_res and resetting (oin->file_disk_off = %u.%u)\n", node_num, HILO(oin->file_disk_off));
-
 		spin_lock(&oin_num_ext_lock);
 		
 		if (oin->num_extends) {