From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24430 invoked by alias); 27 Apr 2009 21:01:56 -0000 Received: (qmail 24315 invoked by alias); 27 Apr 2009 21:01:56 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: gfs2-utils: master - gfs_controld: new libcpg api To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 22c397f3a8495b62e50c271dbcd4fb11c8342af0 X-Git-Newrev: 02f0f259a1432941dc36ca5f09c77ccbd4ae1ee8 From: David Teigland Message-Id: <20090427210130.0BE9E1202D2@lists.fedorahosted.org> Date: Mon, 27 Apr 2009 21:01:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00132.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=02f0f259a1432941dc36ca5f09c77ccbd4ae1ee8 Commit: 02f0f259a1432941dc36ca5f09c77ccbd4ae1ee8 Parent: 22c397f3a8495b62e50c271dbcd4fb11c8342af0 Author: David Teigland AuthorDate: Mon Apr 27 15:55:10 2009 -0500 Committer: David Teigland CommitterDate: Mon Apr 27 15:55:10 2009 -0500 gfs_controld: new libcpg api const and size_t Signed-off-by: David Teigland --- group/gfs_controld/cpg-new.c | 47 +++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 16 deletions(-) diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index f15e3e5..5fafd61 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -2329,9 +2329,12 @@ void process_mountgroups(void) } static int add_change(struct mountgroup *mg, - 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_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, struct change **cg_out) { struct change *cg; @@ -2429,7 +2432,7 @@ static int add_change(struct mountgroup *mg, return error; } -static int we_left(struct cpg_address *left_list, int left_list_entries) +static int we_left(const struct cpg_address *left_list, size_t left_list_entries) { int i; @@ -2440,10 +2443,14 @@ static int we_left(struct cpg_address *left_list, int left_list_entries) return 0; } -static void confchg_cb(cpg_handle_t handle, struct cpg_name *group_name, - 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) +static void confchg_cb(cpg_handle_t handle, + const struct cpg_name *group_name, + 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) { struct mountgroup *mg; struct change *cg; @@ -2522,8 +2529,10 @@ static int gfs_header_check(struct gfs_header *hd, int nodeid) return 0; } -static void deliver_cb(cpg_handle_t handle, struct cpg_name *group_name, - uint32_t nodeid, uint32_t pid, void *data, int len) +static void deliver_cb(cpg_handle_t handle, + const struct cpg_name *group_name, + uint32_t nodeid, uint32_t pid, + void *data, size_t len) { struct mountgroup *mg; struct gfs_header *hd; @@ -3133,8 +3142,10 @@ int set_protocol(void) return 0; } -static void deliver_cb_daemon(cpg_handle_t handle, struct cpg_name *group_name, - uint32_t nodeid, uint32_t pid, void *data, int len) +static void deliver_cb_daemon(cpg_handle_t handle, + const struct cpg_name *group_name, + uint32_t nodeid, uint32_t pid, + void *data, size_t len) { struct gfs_header *hd; @@ -3160,10 +3171,14 @@ static void deliver_cb_daemon(cpg_handle_t handle, struct cpg_name *group_name, } } -static void confchg_cb_daemon(cpg_handle_t handle, struct cpg_name *group_name, - 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) +static void confchg_cb_daemon(cpg_handle_t handle, + const struct cpg_name *group_name, + 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;