[Ocfs2-tools-devel] [PATCH 1/3] ocfs2_controld.pcmk: Use CRM_SERVICE instead of hard-coded value

[Mark Fasheh]

While we're there, we can clean up some unnecessary braces.

Signed-off-by: Andrew Beekhof <abeekhof at suse.de>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
---
 ocfs2_controld/pacemaker.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ocfs2_controld/pacemaker.c b/ocfs2_controld/pacemaker.c
index 9fe5a3f..a47dc0e 100644
--- a/ocfs2_controld/pacemaker.c
+++ b/ocfs2_controld/pacemaker.c
@@ -261,14 +261,12 @@ int setup_stack(void)
 		log_debug("Local node name: %s", local_node_uname);
 	}
 
-	/* 16 := CRM_SERVICE */
 retry:
 	log_debug("Creating connection to our AIS plugin");
-	rc = saServiceConnect (&ais_fd_sync, &ais_fd_async, 16);
-	if (rc != SA_AIS_OK) {
-		log_error("Connection to our AIS plugin failed: %s (%d)",
-			  ais_error2text(rc), rc);
-	}	
+	rc = saServiceConnect (&ais_fd_sync, &ais_fd_async, CRM_SERVICE);
+	if (rc != SA_AIS_OK)
+		log_error("Connection to our AIS plugin (%d) failed: %s (%d)",
+			  CRM_SERVICE, ais_error2text(rc), rc);
 
 	switch(rc) {
 	case SA_AIS_OK:
-- 
1.5.4.1