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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-24 16:49:08 -0600 (Wed, 24 Mar 2004)
New Revision: 810

Modified:
   trunk/src/nm.c
Log:
* add the READONLY entry to process_vote_strings
* print out one additional item when process_vote debugging is enabled
* removed all the other printks in process_vote


Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-03-24 22:41:00 UTC (rev 809)
+++ trunk/src/nm.c	2004-03-24 22:49:08 UTC (rev 810)
@@ -59,7 +59,8 @@
 	"NOT_MASTER",           // I am not master, retry
 	"REMASTER_THIS",        // remaster lock to me
 	"REMASTER_REQUESTOR",   // remaster lock to requestor
-	"DROP_READONLY"	        // RO cachelock needs to convert to RW
+	"DROP_READONLY",        // RO cachelock needs to convert to RW
+	"READONLY"
 };
 
 /*
@@ -846,16 +847,11 @@
 					    status, &master_alive, &oin);
 
 #ifdef VERBOSE_PROCESS_VOTE
-	printk("(%u) ocfs_process_vote: %s request for lockid: %u.%u, action: %s, type: %s\n", ocfs_getpid(),
+	printk("(%u) ocfs_process_vote: %s request for lockid: %u.%u, action: (%u) %s, type: %s\n", ocfs_getpid(),
 	       flags & FLAG_RELEASE_LOCK ? "RELEASE" : 
 	       (flags & FLAG_ACQUIRE_LOCK ? "ACQUIRE" : "MODIFY"), lock_id,
-	       process_vote_strings[vote_type], disk_vote ? "disk vote" : "net vote" );
+	       vote_type, 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
@@ -1071,10 +1067,6 @@
 #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);
@@ -1131,9 +1123,6 @@
 					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;
 			}
 
@@ -1154,9 +1143,6 @@
 
 
 			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;
 			}
@@ -1195,9 +1181,6 @@
 					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