diff options
Diffstat (limited to 'source4/cluster/ctdb')
| -rw-r--r-- | source4/cluster/ctdb/ib/ibwrapper_test.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/server/ctdb_daemon.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/server/ctdb_recoverd.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/server/ctdbd.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/tests/ctdb_bench.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/tests/ctdb_fetch.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/tests/ctdb_store.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/tools/ctdb.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/source4/cluster/ctdb/ib/ibwrapper_test.c b/source4/cluster/ctdb/ib/ibwrapper_test.c index 07c78e7709..1be37ddd28 100644 --- a/source4/cluster/ctdb/ib/ibwrapper_test.c +++ b/source4/cluster/ctdb/ib/ibwrapper_test.c @@ -604,7 +604,7 @@ int main(int argc, char *argv[]) goto cleanup; } - ev = event_context_init(NULL); + ev = s4_event_context_init(NULL); assert(ev); tcx->ibwctx = ibw_init(tcx->attrs, tcx->nattrs, diff --git a/source4/cluster/ctdb/server/ctdb_daemon.c b/source4/cluster/ctdb/server/ctdb_daemon.c index 32aa2ba272..f96cd86916 100644 --- a/source4/cluster/ctdb/server/ctdb_daemon.c +++ b/source4/cluster/ctdb/server/ctdb_daemon.c @@ -650,7 +650,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork) domain_socket_name = talloc_strdup(talloc_autofree_context(), ctdb->daemon.name); talloc_set_destructor(domain_socket_name, unlink_destructor); - ctdb->ev = event_context_init(NULL); + ctdb->ev = s4_event_context_init(NULL); /* start frozen, then let the first election sort things out */ if (!ctdb_blocking_freeze(ctdb)) { diff --git a/source4/cluster/ctdb/server/ctdb_recoverd.c b/source4/cluster/ctdb/server/ctdb_recoverd.c index 5cb985521d..8ebd357c14 100644 --- a/source4/cluster/ctdb/server/ctdb_recoverd.c +++ b/source4/cluster/ctdb/server/ctdb_recoverd.c @@ -1487,7 +1487,7 @@ int ctdb_start_recoverd(struct ctdb_context *ctdb) /* get a new event context */ talloc_free(ctdb->ev); - ctdb->ev = event_context_init(ctdb); + ctdb->ev = s4_event_context_init(ctdb); event_add_fd(ctdb->ev, ctdb, fd[0], EVENT_FD_READ|EVENT_FD_AUTOCLOSE, ctdb_recoverd_parent, &fd[0]); diff --git a/source4/cluster/ctdb/server/ctdbd.c b/source4/cluster/ctdb/server/ctdbd.c index 2c4a23b673..9729902f50 100644 --- a/source4/cluster/ctdb/server/ctdbd.c +++ b/source4/cluster/ctdb/server/ctdbd.c @@ -141,7 +141,7 @@ int main(int argc, const char *argv[]) block_signal(SIGPIPE); - ev = event_context_init(NULL); + ev = s4_event_context_init(NULL); ctdb = ctdb_cmdline_init(ev); diff --git a/source4/cluster/ctdb/tests/ctdb_bench.c b/source4/cluster/ctdb/tests/ctdb_bench.c index f1292ee275..77b7f15d35 100644 --- a/source4/cluster/ctdb/tests/ctdb_bench.c +++ b/source4/cluster/ctdb/tests/ctdb_bench.c @@ -192,7 +192,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = s4_event_context_init(NULL); /* initialise ctdb */ ctdb = ctdb_cmdline_client(ev); diff --git a/source4/cluster/ctdb/tests/ctdb_fetch.c b/source4/cluster/ctdb/tests/ctdb_fetch.c index f57d05d099..d5ec645757 100644 --- a/source4/cluster/ctdb/tests/ctdb_fetch.c +++ b/source4/cluster/ctdb/tests/ctdb_fetch.c @@ -211,7 +211,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = s4_event_context_init(NULL); ctdb = ctdb_cmdline_client(ev); diff --git a/source4/cluster/ctdb/tests/ctdb_store.c b/source4/cluster/ctdb/tests/ctdb_store.c index a60e009b91..8b44276d21 100644 --- a/source4/cluster/ctdb/tests/ctdb_store.c +++ b/source4/cluster/ctdb/tests/ctdb_store.c @@ -131,7 +131,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = s4_event_context_init(NULL); ctdb = ctdb_cmdline_client(ev); diff --git a/source4/cluster/ctdb/tools/ctdb.c b/source4/cluster/ctdb/tools/ctdb.c index 2308261d00..3be42cee5b 100644 --- a/source4/cluster/ctdb/tools/ctdb.c +++ b/source4/cluster/ctdb/tools/ctdb.c @@ -977,7 +977,7 @@ int main(int argc, const char *argv[]) control = extra_argv[0]; - ev = event_context_init(NULL); + ev = s4_event_context_init(NULL); /* initialise ctdb */ ctdb = ctdb_cmdline_client(ev); |