cluster: STABLE3 - qdisk: Do not do a clean logout when exiting w/ error

cluster: STABLE3 - qdisk: Do not do a clean logout when exiting w/ error

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a2c877a72c0ca90f11b52cdb2f92f2d58bad3fb5
Commit:        a2c877a72c0ca90f11b52cdb2f92f2d58bad3fb5
Parent:        91dd96a00b0aa756b65dce961b82efa532b41053
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Mon Jul 13 11:47:38 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue Aug 11 15:03:36 2009 -0400

qdisk: Do not do a clean logout when exiting w/ error

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 cman/qdisk/main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 1b55763..fb29e8d 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1798,12 +1798,14 @@ main(int argc, char **argv)
 
 	io_nanny_start(ctx.qc_tko * ctx.qc_interval);
 
-	if (quorum_loop(&ctx, ni, MAX_NODES_DISK) == 0)
+	if (quorum_loop(&ctx, ni, MAX_NODES_DISK) == 0) {
+		/* Only clean up if we're exiting w/o error) */
 		cman_unregister_quorum_device(ctx.qc_cman_admin);
+		quorum_logout(&ctx);
+	}
 
 	io_nanny_stop();
 
-	quorum_logout(&ctx);
 out:
 	/* free cman handle to avoid leak in cman */
 	cman_finish(ch_admin);