ctdb-common: Drop ctdb prefix from utility functions independent of ctdb

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

diff --git a/ctdb/common/ctdb_fork.c b/ctdb/common/ctdb_fork.c
index 1343fd726175e0ddec2cdc7a9558b3eae903153a..aa9bcf01bc4926f038133760acdb522dbd7eb0ae 100644 (file)
--- a/ctdb/common/ctdb_fork.c
+++ b/ctdb/common/ctdb_fork.c
@@ -92,7 +92,7 @@ pid_t ctdb_fork_no_free_ringbuffer(struct ctdb_context *ctdb)
 
                /* The child does not need to be realtime */
                if (ctdb->do_setsched) {
-                       ctdb_restore_scheduler();
+                       reset_scheduler();
                }
                ctdb->can_send_controls = false;
 

diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index b2f0ee72af0ee613a32d63d27dee7fdc451a0212..5cba124422f05c0fb9c88acbe551d2ada80c4bf4 100644 (file)
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -329,7 +329,7 @@ struct ctdb_rec_data *ctdb_marshall_loop_next(struct ctdb_marshall_buffer *m, st
 /*
   if possible, make this task real time
  */
-void ctdb_set_scheduler(void)
+void set_scheduler(void)
 {
 #ifdef _AIX_
 #if HAVE_THREAD_SETSCHED
@@ -366,9 +366,9 @@ void ctdb_set_scheduler(void)
 }
 
 /*
-  restore previous scheduler parameters
+  reset scheduler from real-time to normal scheduling
  */
-void ctdb_restore_scheduler(void)
+void reset_scheduler(void)
 {
 #ifdef _AIX_
 #if HAVE_THREAD_SETSCHED

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 4d80415233b44bd7ed6f4659394fd1089b559ea0..089ef9cb68bff2906fd1124a1d6bfbd9caf15291 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1087,8 +1087,8 @@ void ctdb_call_resend_all(struct ctdb_context *ctdb);
 void ctdb_node_dead(struct ctdb_node *node);
 void ctdb_node_connected(struct ctdb_node *node);
 bool ctdb_blocking_freeze(struct ctdb_context *ctdb);
-void ctdb_set_scheduler(void);
-void ctdb_restore_scheduler(void);
+void set_scheduler(void);
+void reset_scheduler(void);
 
 struct tevent_signal *ctdb_init_sigchld(struct ctdb_context *ctdb);
 void ctdb_track_child(struct ctdb_context *ctdb, pid_t pid);

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 2f0aa4a0911beeb866942c34033814da1385ee22..e7a610ea9ec5024bb0f3a63a165802550b704e55 100644 (file)
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1185,7 +1185,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog)
 
        if (ctdb->do_setsched) {
                /* try to set us up as realtime */
-               ctdb_set_scheduler();
+               set_scheduler();
        }
 
        /* ensure the socket is deleted on exit of the daemon */