diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-06-10 17:00:38 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-06-12 05:40:10 +0200 |
| commit | 8c8ef5640e17c1acbda99921277a41442bcc4801 (patch) | |
| tree | e73be857f5a77363cd115cf2fc672a22fc109970 | |
| parent | 22f71579a46203236bb6ec7e5bef3b2151700898 (diff) | |
| download | samba-8c8ef5640e17c1acbda99921277a41442bcc4801.tar.gz samba-8c8ef5640e17c1acbda99921277a41442bcc4801.tar.xz samba-8c8ef5640e17c1acbda99921277a41442bcc4801.zip | |
ctdb-daemon: Rename ctdb_lockdown_memory to lockdown_memory
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
| -rw-r--r-- | ctdb/common/ctdb_util.c | 2 | ||||
| -rw-r--r-- | ctdb/include/ctdb_private.h | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_ltdb_server.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index bbaa5ae2187..94051a4818a 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -406,7 +406,7 @@ unsigned ctdb_addr_to_port(ctdb_sock_addr *addr) /* we don't lock future pages here; it would increase the chance that * we'd fail to mmap later on. */ -void ctdb_lockdown_memory(bool valgrinding) +void lockdown_memory(bool valgrinding) { #if defined(HAVE_MLOCKALL) && !defined(_AIX_) /* Extra stack, please! */ diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index edba45be804..62912fc5e27 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -1370,7 +1370,7 @@ int ctdb_repack(struct ctdb_context *ctdb, int argc, const char **argv); int32_t ctdb_monitoring_mode(struct ctdb_context *ctdb); bool ctdb_stopped_monitoring(struct ctdb_context *ctdb); int ctdb_set_child_logging(struct ctdb_context *ctdb); -void ctdb_lockdown_memory(bool valgrinding); +void lockdown_memory(bool valgrinding); struct client_async_data { enum ctdb_controls opcode; diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 614ed6bd7e6..391f2444f91 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1317,7 +1317,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog) exit(1); } - ctdb_lockdown_memory(ctdb->valgrinding); + lockdown_memory(ctdb->valgrinding); /* go into a wait loop to allow other nodes to complete */ event_loop_wait(ctdb->ev); diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index b9445cdaaad..02fd3a5ab85 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -1151,7 +1151,7 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata, outdata->dsize = sizeof(db->db_id); /* Try to ensure it's locked in mem */ - ctdb_lockdown_memory(ctdb->valgrinding); + lockdown_memory(ctdb->valgrinding); /* tell all the other nodes about this database */ ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_ALL, tdb_flags, |