[Cluster-devel] cluster/fence/fenced agent.c fd.h recover.c

[rohara at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rohara at sourceware.org	2006-12-01 19:17:46

Modified files:
	fence/fenced   : agent.c fd.h recover.c 

Log message:
	Remove option to pass "self" parameter.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/agent.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15&r2=1.15.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/fd.h.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.24&r2=1.24.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/recover.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.25&r2=1.25.2.1

--- cluster/fence/fenced/agent.c	2006/07/10 17:02:43	1.15
+++ cluster/fence/fenced/agent.c	2006/12/01 19:17:46	1.15.2.1
@@ -129,7 +129,7 @@
 	return -1;
 }
 
-static int make_args(int cd, char *victim, char *self, char *method, int d,
+static int make_args(int cd, char *victim, char *method, int d,
 		     char *device, char **args_out)
 {
 	char path[256], *args, *str;
@@ -180,13 +180,6 @@
 		free(str);
 	}
 
-	if (self != NULL) {
-		memset(path, 0, 256);
-		sprintf(path, "self=%s", self);
-		strcat(args, path);
-		strcat(args, "\n");
-	}
-
 	if (error) {
 		free(args);
 		args = NULL;
@@ -260,7 +253,7 @@
 	return i;
 }
 
-static int use_device(int cd, char *victim, char *self,char *method, int d,
+static int use_device(int cd, char *victim, char *method, int d,
 		      char *device)
 {
 	char path[256], *agent, *args = NULL;
@@ -273,7 +266,7 @@
 	if (error)
 		goto out;
 
-	error = make_args(cd, victim, self, method, d, device, &args);
+	error = make_args(cd, victim, method, d, device, &args);
 	if (error)
 		goto out_agent;
 
@@ -309,7 +302,7 @@
 	cman_finish(ch);
 }
 
-int dispatch_fence_agent(int cd, char *victim, char *self)
+int dispatch_fence_agent(int cd, char *victim)
 {
 	char *method = NULL, *device = NULL;
 	int num_methods, num_devices, m, d, error = -1;
@@ -332,7 +325,7 @@
 			if (error)
 				break;
 
-			error = use_device(cd, victim, self, method, d, device);
+			error = use_device(cd, victim, method, d, device);
 			if (error)
 				break;
 
--- cluster/fence/fenced/fd.h	2006/10/09 10:52:50	1.24
+++ cluster/fence/fenced/fd.h	2006/12/01 19:17:46	1.24.2.1
@@ -173,7 +173,7 @@
 void do_recovery_done(fd_t *fd);
 
 /* agent.c */
-int dispatch_fence_agent(int cd, char *victim, char *self);
+int dispatch_fence_agent(int cd, char *victim);
 
 /* group.c */
 int setup_groupd(void);
--- cluster/fence/fenced/recover.c	2006/10/09 10:52:50	1.25
+++ cluster/fence/fenced/recover.c	2006/12/01 19:17:46	1.25.2.1
@@ -16,7 +16,6 @@
 
 extern int our_nodeid;
 extern commandline_t comline;
-extern char *our_name;
 
 /* Fencing recovery algorithm
 
@@ -310,7 +309,7 @@
 		log_debug("fencing node %s", node->name);
 		syslog(LOG_INFO, "fencing node \"%s\"", node->name);
 
-		error = dispatch_fence_agent(cd, node->name, our_name);
+		error = dispatch_fence_agent(cd, node->name);
 
 		syslog(LOG_INFO, "fence \"%s\" %s", node->name,
 		       error ? "failed" : "success");