From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8322 invoked by alias); 27 Apr 2009 20:56:09 -0000 Received: (qmail 8309 invoked by alias); 27 Apr 2009 20:56:08 -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: fence: master - fenced: new libcpg api To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: dea805993acb4c6368a4a96f8bba80658c8b45f1 X-Git-Newrev: c5cb7ebb5af53c1999ee587f59fc6cdf6ee98077 From: David Teigland Message-Id: <20090427205535.94F6B1202D2@lists.fedorahosted.org> Date: Mon, 27 Apr 2009 20:56: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/msg00130.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=c5cb7ebb5af53c1999ee587f59fc6cdf6ee98077 Commit: c5cb7ebb5af53c1999ee587f59fc6cdf6ee98077 Parent: dea805993acb4c6368a4a96f8bba80658c8b45f1 Author: David Teigland AuthorDate: Mon Apr 27 15:46:27 2009 -0500 Committer: David Teigland CommitterDate: Mon Apr 27 15:46:27 2009 -0500 fenced: new libcpg api const and size_t Signed-off-by: David Teigland --- fence/fenced/cpg.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/fence/fenced/cpg.c b/fence/fenced/cpg.c index cf15579..91e2b59 100644 --- a/fence/fenced/cpg.c +++ b/fence/fenced/cpg.c @@ -1081,9 +1081,12 @@ void process_fd_changes(void) } static int add_change(struct fd *fd, - 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; @@ -1197,7 +1200,7 @@ static void add_victims_init(struct fd *fd, struct change *cg) } } -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; @@ -1208,10 +1211,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 fd *fd; struct change *cg; @@ -1744,8 +1751,10 @@ int set_protocol(void) kernel state and they can skip fencing us if we're a victim. (We have to check for that uncontrolled state before calling setup_cpg, obviously.) */ -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 fd_header *hd; @@ -1766,10 +1775,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;