From 2897cfb5568a9fb535aa95bb8aec1f2f4edf9182 Mon Sep 17 00:00:00 2001
From: Christine Caulfield <ccaulfie@redhat.com>
Date: Wed, 3 Jun 2009 13:42:02 +0000
Subject: [PATCH] Fix clvmd-corosync to match the new corosync API.

---
 WHATS_NEW                      |  1 +
 daemons/clvmd/clvmd-corosync.c | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index fa57e860d..8844c6435 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.48 - 
 ===============================
+  Fix clvmd-corosync to match new corosync API.
   Fix makefile to build also shared libraries when running plain make.
   Fix rename of active snapshot with virtual origin.
   Fix convert polling to ignore LV with different UUID.
diff --git a/daemons/clvmd/clvmd-corosync.c b/daemons/clvmd/clvmd-corosync.c
index ee9064195..be8ff7878 100644
--- a/daemons/clvmd/clvmd-corosync.c
+++ b/daemons/clvmd/clvmd-corosync.c
@@ -56,16 +56,16 @@
 #define LOCKSPACE_NAME "clvmd"
 
 static void cpg_deliver_callback (cpg_handle_t handle,
-				  struct cpg_name *groupName,
+				  const struct cpg_name *groupName,
 				  uint32_t nodeid,
 				  uint32_t pid,
 				  void *msg,
-				  int msg_len);
+				  size_t msg_len);
 static void cpg_confchg_callback(cpg_handle_t handle,
-				 struct cpg_name *groupName,
-				 struct cpg_address *member_list, int member_list_entries,
-				 struct cpg_address *left_list, int left_list_entries,
-				 struct cpg_address *joined_list, int joined_list_entries);
+				 const struct cpg_name *groupName,
+				 const struct cpg_address *member_list, size_t member_list_entries,
+				 const struct cpg_address *left_list, size_t left_list_entries,
+				 const struct cpg_address *joined_list, size_t joined_list_entries);
 static void _cluster_closedown(void);
 
 /* Hash list of nodes in the cluster */
@@ -206,17 +206,17 @@ static char *print_corosync_csid(const char *csid)
 }
 
 static void cpg_deliver_callback (cpg_handle_t handle,
-				  struct cpg_name *groupName,
+				  const struct cpg_name *groupName,
 				  uint32_t nodeid,
 				  uint32_t pid,
 				  void *msg,
-				  int msg_len)
+				  size_t msg_len)
 {
 	int target_nodeid;
 
 	memcpy(&target_nodeid, msg, COROSYNC_CSID_LEN);
 
-	DEBUGLOG("%u got message from nodeid %d for %d. len %d\n",
+	DEBUGLOG("%u got message from nodeid %d for %d. len %zd\n",
 		 our_nodeid, nodeid, target_nodeid, msg_len-4);
 
 	if (nodeid != our_nodeid)
@@ -226,15 +226,15 @@ static void cpg_deliver_callback (cpg_handle_t handle,
 }
 
 static void cpg_confchg_callback(cpg_handle_t handle,
-				 struct cpg_name *groupName,
-				 struct cpg_address *member_list, int member_list_entries,
-				 struct cpg_address *left_list, int left_list_entries,
-				 struct cpg_address *joined_list, int joined_list_entries)
+				 const struct cpg_name *groupName,
+				 const struct cpg_address *member_list, size_t member_list_entries,
+				 const struct cpg_address *left_list, size_t left_list_entries,
+				 const struct cpg_address *joined_list, size_t joined_list_entries)
 {
 	int i;
 	struct node_info *ninfo;
 
-	DEBUGLOG("confchg callback. %d joined, %d left, %d members\n",
+	DEBUGLOG("confchg callback. %zd joined, %zd left, %zd members\n",
 		 joined_list_entries, left_list_entries, member_list_entries);
 
 	for (i=0; i<joined_list_entries; i++) {
@@ -580,7 +580,7 @@ static int _get_cluster_name(char *buf, int buflen)
 {
 	confdb_handle_t handle;
 	int result;
-	int namelen = buflen;
+	size_t namelen = buflen;
 	hdb_handle_t cluster_handle;
 	confdb_callbacks_t callbacks = {
 		.confdb_key_change_notify_fn = NULL,
-- 
2.43.5