From: Jim Meyering <[email protected]>
propagate the change:
* include/corosync/engine/quorum.h (quorum_set_quorate_fn_t):
* exec/vsf_quorum.c (quorum_view_list_entries):
(quorum_api_set_quorum, quorum_exec_init_fn):
* exec/vsf_ykd.c (ykd_primary_callback_fn):
---
exec/vsf_quorum.c | 9 ++++-----
exec/vsf_ykd.c | 2 +-
include/corosync/engine/quorum.h | 5 +++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/exec/vsf_quorum.c b/exec/vsf_quorum.c
index 1c959b4..14e7e1e 100644
--- a/exec/vsf_quorum.c
+++ b/exec/vsf_quorum.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
*
* All rights reserved.
*
@@ -95,7 +95,7 @@ static struct corosync_api_v1 *corosync_api;
static struct list_head lib_trackers_list;
static struct list_head internal_trackers_list;
static struct memb_ring_id quorum_ring_id;
-static int quorum_view_list_entries = 0;
+static size_t quorum_view_list_entries = 0;
static int quorum_view_list[PROCESSOR_COUNT_MAX];
struct quorum_services_api_ver1 *quorum_iface = NULL;
@@ -107,7 +107,7 @@ static void (*sync_primary_callback_fn) (
/* Internal quorum API function */
static void quorum_api_set_quorum(unsigned int *view_list,
- int view_list_entries,
+ size_t view_list_entries,
int quorum, struct memb_ring_id *ring_id)
{
primary_designated = quorum;
@@ -308,7 +308,7 @@ static int quorum_exec_init_fn (struct corosync_api_v1 *api)
}
if (!quorum_iface) {
/*
- * With no quorum provider, we are always quorate
+ * With no quorum provider, we are always quorate
*/
primary_designated = 1;
}
@@ -468,4 +468,3 @@ static void message_handler_req_lib_quorum_trackstop (void
*conn, void *msg)
res.error = CS_OK;
corosync_api->ipc_response_send(conn, &res, sizeof(mar_res_header_t));
}
-
diff --git a/exec/vsf_ykd.c b/exec/vsf_ykd.c
index eff9d02..521fedd 100644
--- a/exec/vsf_ykd.c
+++ b/exec/vsf_ykd.c
@@ -146,7 +146,7 @@ static struct corosync_api_v1 *api;
static void (*ykd_primary_callback_fn) (
unsigned int *view_list,
- int view_list_entries,
+ size_t view_list_entries,
int primary_designated,
struct memb_ring_id *ring_id) = NULL;
diff --git a/include/corosync/engine/quorum.h b/include/corosync/engine/quorum.h
index 9bd9780..cca3e23 100644
--- a/include/corosync/engine/quorum.h
+++ b/include/corosync/engine/quorum.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
*
* All rights reserved.
*
@@ -35,7 +35,8 @@
#ifndef QUORUM_H_DEFINED
#define QUORUM_H_DEFINED
-typedef void (*quorum_set_quorate_fn_t) (unsigned int *view_list, int
view_list_entries,
+typedef void (*quorum_set_quorate_fn_t) (unsigned int *view_list,
+ size_t view_list_entries,
int quorate, struct memb_ring_id *);
struct quorum_services_api_ver1 {
--
1.6.2.rc1.285.gc5f54
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais