From 0500b87092540d300b4e021a0fb95ce16a44fbd2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 20 Dec 2007 00:02:15 +0100 Subject: r26540: Revert my previous commit after concerns raised by Andrew. (This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173) --- source4/cluster/ctdb/brlock_ctdb.c | 2 +- source4/cluster/ctdb/tools/ctdb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/cluster') diff --git a/source4/cluster/ctdb/brlock_ctdb.c b/source4/cluster/ctdb/brlock_ctdb.c index 1b22c6c727..c38d666c3c 100644 --- a/source4/cluster/ctdb/brlock_ctdb.c +++ b/source4/cluster/ctdb/brlock_ctdb.c @@ -102,7 +102,7 @@ static void show_locks(const char *op, struct lock_struct *locks, int count) talloc_free(). We need the messaging_ctx to allow for pending lock notifications. */ -static struct brl_context *brl_ctdb_init(TALLOC_CTX *mem_ctx, struct server_id server, struct loadparm_context *lp_ctx, +static struct brl_context *brl_ctdb_init(TALLOC_CTX *mem_ctx, struct server_id server, struct messaging_context *messaging_ctx) { struct ctdb_context *ctdb = talloc_get_type(cluster_backend_handle(), diff --git a/source4/cluster/ctdb/tools/ctdb.c b/source4/cluster/ctdb/tools/ctdb.c index 7d25c068bc..2308261d00 100644 --- a/source4/cluster/ctdb/tools/ctdb.c +++ b/source4/cluster/ctdb/tools/ctdb.c @@ -241,7 +241,7 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv printf("Number of nodes:%d\n", nodemap->num); for(i=0;inum;i++){ - const struct { + static const struct { uint32_t flag; const char *name; } flag_names[] = { -- cgit