ctdb-daemon: Rename ctdb_lockdown_memory to lockdown_memory

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index bbaa5ae21877217ea93ec41b8ffe1f2029c37e6b..94051a4818af12e19bc31d37b797180f9a39bbdf 100644 (file)
--- 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 edba45be8046295acca912349735f5fba81c860d..62912fc5e272951947bc712f6de5dd7444c77f6d 100644 (file)
--- 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 614ed6bd7e6835e6e3b582ffed4bf451a09d0df7..391f2444f913aa6c52b7606941e1427397c28574 100644 (file)
--- 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 b9445cdaaad5d9a2be1078309315f72156a6cb36..02fd3a5ab8517a2d131f57c48a7bb86a3b3b65eb 100644 (file)
--- 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,