gfs2-utils: master - gfs_controld: dlm_controld failure is cluster_dead

gfs2-utils: master - gfs_controld: dlm_controld failure is cluster_dead

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=ec9ec0451669c081bde50ad41280b94aa2e0c11b
Commit:        ec9ec0451669c081bde50ad41280b94aa2e0c11b
Parent:        4355e3e4252e7bc185c15f4a2d3c53a433c01cc4
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Tue Mar 10 15:53:11 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Tue Mar 10 15:53:11 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 53d6e90..3383453 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -1041,13 +1041,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;
@@ -1096,7 +1089,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);
 
 	for (;;) {
 		rv = poll(pollfd, client_maxi + 1, poll_timeout);