cluster: STABLE3 - dlm_controld: new libcpg api

cluster: STABLE3 - dlm_controld: new libcpg api

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=406bfdc8202a887e48e9fe22e0c125401dd5861f
Commit:        406bfdc8202a887e48e9fe22e0c125401dd5861f
Parent:        85e44738ea85fd36d0af5ff257afff051d5e4460
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Mon Apr 27 15:58:32 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Mon Apr 27 15:58:32 2009 -0500

dlm_controld: new libcpg api

api conversion missed size_t in one confchg

Signed-off-by: David Teigland <teigland@redhat.com>
---
 group/dlm_controld/deadlock.c   |    9 ++++++---
 group/dlm_controld/dlm_daemon.h |    9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/group/dlm_controld/deadlock.c b/group/dlm_controld/deadlock.c
index 05b2241..36426e9 100644
--- a/group/dlm_controld/deadlock.c
+++ b/group/dlm_controld/deadlock.c
@@ -1076,9 +1076,12 @@ static void node_left(struct lockspace *ls, int nodeid, int reason)
 static void purge_locks(struct lockspace *ls, int nodeid);
 
 void deadlk_confchg(struct lockspace *ls,
-		const struct cpg_address *member_list, int member_list_entries,
-		const struct cpg_address *left_list, int left_list_entries,
-		const struct cpg_address *joined_list, int joined_list_entries)
+		    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;
 
diff --git a/group/dlm_controld/dlm_daemon.h b/group/dlm_controld/dlm_daemon.h
index 1f49800..cdb2210 100644
--- a/group/dlm_controld/dlm_daemon.h
+++ b/group/dlm_controld/dlm_daemon.h
@@ -257,9 +257,12 @@ void receive_cycle_start(struct lockspace *ls, struct dlm_header *hd, int len);
 void receive_cycle_end(struct lockspace *ls, struct dlm_header *hd, int len);
 void receive_cancel_lock(struct lockspace *ls, struct dlm_header *hd, int len);
 void deadlk_confchg(struct lockspace *ls,
-	const struct cpg_address *member_list, int member_list_entries,
-	const struct cpg_address *left_list, int left_list_entries,
-	const struct cpg_address *joined_list, int joined_list_entries);
+		    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);
 
 /* main.c */
 int do_read(int fd, void *buf, size_t count);