[Ocfs2-commits] khackel commits r1237 - trunk/src

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-07-02 17:17:58 -0500 (Fri, 02 Jul 2004)
New Revision: 1237

Modified:
   trunk/src/dlm.c
   trunk/src/ocfs.h
   trunk/src/proc.c
   trunk/src/super.c
Log:
remove comm_voting parameter (network voting always done now)
change vote_status to int
remove dead nodes when looping in the net voting

Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-07-02 22:12:44 UTC (rev 1236)
+++ trunk/src/dlm.c	2004-07-02 22:17:58 UTC (rev 1237)
@@ -48,8 +48,6 @@
 #include "ocfs_journal.h"
 #include "buffer_head_io.h"
 
-extern __u32 comm_voting;
-
 #define WAIT_FOR_VOTE_INCREMENT  200
 
 /* Tracing */
@@ -1111,7 +1109,9 @@
 
 	status = -EAGAIN;
 	while (status == -EAGAIN) {
-		if (comm_voting && !disk_vote) {
+		// remove dead nodes
+		ocfs_node_map_and(&votemap, &osb->publ_map);
+		if (!disk_vote) {
 			LOG_TRACE_STR ("Network vote");
 			status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type, flags, 
 							    &votemap, NULL, inode, &vote_status);
@@ -1386,7 +1386,9 @@
 
 	/* net voting */
 try_net_again:
-	if (comm_voting && !*disk_vote) {
+	// remove dead nodes
+	ocfs_node_map_and(&vote_map, &osb->publ_map);
+	if (!*disk_vote) {
 		LOG_TRACE_STR ("Network vote");
 		status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type, flags, 
 						    &vote_map, &open_map, inode, &vote_status);

Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-07-02 22:12:44 UTC (rev 1236)
+++ trunk/src/ocfs.h	2004-07-02 22:17:58 UTC (rev 1237)
@@ -757,7 +757,7 @@
 	spinlock_t lock;
 	__u32 vote_state;
 	__u32 req_lock_type;
-	__u32 vote_status;
+	int vote_status;
 	ocfs_node_map req_vote_map;
 	ocfs_node_map got_vote_map;
 	ocfs_node_map tmp_openmap;

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-07-02 22:12:44 UTC (rev 1236)
+++ trunk/src/proc.c	2004-07-02 22:17:58 UTC (rev 1237)
@@ -42,9 +42,7 @@
 #include "proc.h"
 #include "vote.h"
 
-extern __u32 comm_voting;
 
-
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT      OCFS_DEBUG_CONTEXT_PROC
 
@@ -152,7 +150,6 @@
 
 	LOG_ENTRY ();
 
-	len += sprintf(page + len, "comm voting  : %d\n", comm_voting);
 	len += sprintf(page + len, "ip addr/port : 0x%08u/%u\n",
 		       ntohl(OcfsGlobalCtxt.comm_info.addr_u.ip_addr4),
 		       ntohs(OcfsGlobalCtxt.comm_info.ip_port));

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-07-02 22:12:44 UTC (rev 1236)
+++ trunk/src/super.c	2004-07-02 22:17:58 UTC (rev 1237)
@@ -87,7 +87,6 @@
 __u32 ip_port_v2 = 0;
 char *guid = NULL;
 __u32 cs = 0;
-__u32 comm_voting = 0;
 char *ocfs_hostname;
 
 #ifdef EVIL_TRACE
@@ -109,8 +108,6 @@
 	&sysctl_intvec, NULL, NULL, NULL},
 	{3, "debug_exclude", &debug_exclude, sizeof (__u32), 0644, NULL, &proc_dointvec, 
 	&sysctl_intvec, NULL, NULL, NULL},
-	{4, "comm_voting", &comm_voting, sizeof (__u32), 0644, NULL, &proc_dointvec, 
-	&sysctl_intvec, NULL, NULL, NULL},
 	{0}
 };
 
@@ -140,7 +137,6 @@
 module_param (ip_port_v2, uint, 0);
 module_param (guid, charp, 0);
 module_param (cs, uint, 0);
-module_param (comm_voting, uint, 0);
 #else /* 2.6.x kernel */
 MODULE_PARM (node_name, "s");
 MODULE_PARM_DESC(node_name, "Name of this machine in the cluster");
@@ -160,8 +156,6 @@
 MODULE_PARM_DESC(guid, "GUID for this machine");
 MODULE_PARM (cs, "i");
 MODULE_PARM_DESC(cs, "Checksum");
-MODULE_PARM (comm_voting, "i");
-MODULE_PARM_DESC(comm_voting, "Enable/Disable network dlm");
 #endif /* Linux 2.4 stuff */
 
 extern struct semaphore recovery_list_sem;