cluster: STABLE3 - fenced/dlm_controld/gfs_controld: clean up cman admin handle

cluster: STABLE3 - fenced/dlm_controld/gfs_controld: clean up cman admin handle

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7e273f6f977c546ec7cc997be54ec138e29635f3
Commit:        7e273f6f977c546ec7cc997be54ec138e29635f3
Parent:        1e24efc0b7aea726791287bf01e18c4e35de4592
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Fri Feb 27 10:41:52 2009 -0600
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Fri Feb 27 10:41:52 2009 -0600

fenced/dlm_controld/gfs_controld: clean up cman admin handle

Daemons were missing cman_finish() on the cman admin handles.

Signed-off-by: David Teigland <teigland@redhat.com>
---
 fence/fenced/member_cman.c       |    5 +++++
 group/dlm_controld/member_cman.c |    5 +++++
 group/gfs_controld/member_cman.c |    6 ++++++
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/fence/fenced/member_cman.c b/fence/fenced/member_cman.c
index c99215d..4b9722d 100644
--- a/fence/fenced/member_cman.c
+++ b/fence/fenced/member_cman.c
@@ -181,6 +181,7 @@ int setup_cman(void)
 	ch = cman_init(NULL);
 	if (!ch) {
 		log_error("cman_init error %d", errno);
+		cman_finish(ch_admin);
 		return -ENOTCONN;
 	}
 
@@ -193,6 +194,7 @@ int setup_cman(void)
 		}
 		log_error("cman_is_active error %d", errno);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		return -ENOTCONN;
 	}
 
@@ -200,6 +202,7 @@ int setup_cman(void)
 	if (rv < 0) {
 		log_error("cman_start_notification error %d %d", rv, errno);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		return rv;
 	}
 
@@ -213,6 +216,7 @@ int setup_cman(void)
 	if (rv < 0) {
 		log_error("cman_get_node us error %d %d", rv, errno);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		fd = rv;
 		goto out;
 	}
@@ -229,6 +233,7 @@ int setup_cman(void)
 void close_cman(void)
 {
 	cman_finish(ch);
+	cman_finish(ch_admin);
 }
 
 int is_cman_member(int nodeid)
diff --git a/group/dlm_controld/member_cman.c b/group/dlm_controld/member_cman.c
index 19403f5..4caaaa5 100644
--- a/group/dlm_controld/member_cman.c
+++ b/group/dlm_controld/member_cman.c
@@ -183,6 +183,7 @@ int setup_cluster(void)
 	ch = cman_init(NULL);
 	if (!ch) {
 		log_error("cman_init error %d", errno);
+		cman_finish(ch_admin);
 		return -ENOTCONN;
 	}
 
@@ -195,6 +196,7 @@ int setup_cluster(void)
 		}
 		log_error("cman_is_active error %d", errno);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		return -ENOTCONN;
 	}
 
@@ -202,6 +204,7 @@ int setup_cluster(void)
 	if (rv < 0) {
 		log_error("cman_start_notification error %d %d", rv, errno);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		return rv;
 	}
 
@@ -214,6 +217,7 @@ int setup_cluster(void)
 		log_error("cman_get_node us error %d %d", rv, errno);
 		cman_stop_notification(ch);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		fd = rv;
 		goto out;
 	}
@@ -230,6 +234,7 @@ int setup_cluster(void)
 void close_cluster(void)
 {
 	cman_finish(ch);
+	cman_finish(ch_admin);
 }
 
 /* Force re-read of cman nodes */
diff --git a/group/gfs_controld/member_cman.c b/group/gfs_controld/member_cman.c
index 2bd72d0..f536d30 100644
--- a/group/gfs_controld/member_cman.c
+++ b/group/gfs_controld/member_cman.c
@@ -65,6 +65,7 @@ int setup_cman(void)
 	ch = cman_init(NULL);
 	if (!ch) {
 		log_error("cman_init error %d", errno);
+		cman_finish(ch_admin);
 		return -ENOTCONN;
 	}
 
@@ -77,6 +78,7 @@ int setup_cman(void)
 		}
 		log_error("cman_is_active error %d", errno);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		return -ENOTCONN;
 	}
 
@@ -84,6 +86,7 @@ int setup_cman(void)
 	if (rv < 0) {
 		log_error("cman_start_notification error %d %d", rv, errno);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		return rv;
 	}
 
@@ -96,6 +99,7 @@ int setup_cman(void)
 		log_error("cman_get_cluster error %d %d", rv, errno);
 		cman_stop_notification(ch);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		return rv;
 	}
 	clustername = cluster.ci_name;
@@ -106,6 +110,7 @@ int setup_cman(void)
 		log_error("cman_get_node error %d %d", rv, errno);
 		cman_stop_notification(ch);
 		cman_finish(ch);
+		cman_finish(ch_admin);
 		fd = rv;
 		goto out;
 	}
@@ -117,5 +122,6 @@ int setup_cman(void)
 void close_cman(void)
 {
 	cman_finish(ch);
+	cman_finish(ch_admin);
 }