cluster: STABLE3 - cman: Tidy the shutdown code.

cluster: STABLE3 - cman: Tidy the shutdown code.

[Christine Caulfield]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a0b7e5fc2d35021b5617cece6b959859efdfaba6
Commit:        a0b7e5fc2d35021b5617cece6b959859efdfaba6
Parent:        212f926220e45c0366ba23dc4bb9e5306fcc21ad
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Wed Aug 5 14:04:41 2009 +0100
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Wed Aug 5 14:04:41 2009 +0100

cman: Tidy the shutdown code.

Remove some duplicate code

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 cman/daemon/commands.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index b7f7293..f31f47d 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -993,7 +993,8 @@ static void check_shutdown_status(void)
 	/* All replies safely gathered in ? */
 	if (shutdown_yes + shutdown_no >= shutdown_expected) {
 
-		corosync->timer_delete(shutdown_timer);
+		if (shutdown_timer)
+			corosync->timer_delete(shutdown_timer);
 
 		if (shutdown_yes >= shutdown_expected ||
 		    shutdown_flags & SHUTDOWN_ANYWAY) {
@@ -1071,14 +1072,8 @@ static int do_cmd_try_shutdown(struct connection *con, char *cmdbuf)
 
 	/* If no-one is listening for events then we can just go down now */
 	if (shutdown_expected == 0) {
-		int leaveflags = CLUSTER_LEAVEFLAG_DOWN;
-
-		quit_threads = 1;
-		if (shutdown_flags & SHUTDOWN_REMOVE)
-			leaveflags |= CLUSTER_LEAVEFLAG_REMOVED;
-
-		send_leave(leaveflags);
-		return 0;
+		shutdown_timer = 0;
+		check_shutdown_status();
 	}
 	else {
 
@@ -1091,6 +1086,7 @@ static int do_cmd_try_shutdown(struct connection *con, char *cmdbuf)
 
 		return -EWOULDBLOCK;
 	}
+	return 0;
 }
 
 static int do_cmd_register_quorum_device(char *cmdbuf, int *retlen)