cluster: STABLE3 - gfs_controld: dlm_controld failure is cluster_dead

cluster: STABLE3 - gfs_controld: dlm_controld failure is cluster_dead

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=017303d85ab16c30464c43e4ca9041445cc40be4
Commit:        017303d85ab16c30464c43e4ca9041445cc40be4
Parent:        c532b00466cb076b803623245d2825dcbb3ea58c
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Tue Mar 10 13:49:03 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Tue Mar 10 13:49:03 2009 -0500

gfs_controld: dlm_controld failure is cluster_dead

Losing the dlm_controld connection is equivalent to a cluster failure.

Signed-off-by: David Teigland <teigland@redhat.com>
---
 group/gfs_controld/main.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c
index 399ae41..b15698e 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -1115,13 +1115,6 @@ void cluster_dead(int ci)
 	cluster_down = 1;
 }
 
-static void dlmcontrol_dead(int ci)
-{
-	if (!list_empty(&mountgroups))
-		log_error("dlm_controld is gone");
-	client_dead(ci);
-}
-
 static void loop(void)
 {
 	int poll_timeout = -1;
@@ -1203,7 +1196,7 @@ static void loop(void)
 		rv = setup_dlmcontrol();
 		if (rv < 0)
 			goto out;
-		client_add(rv, process_dlmcontrol, dlmcontrol_dead);
+		client_add(rv, process_dlmcontrol, cluster_dead);
 
 	} else if (group_mode == GROUP_LIBGROUP) {