diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-06-10 16:48:03 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-06-12 05:40:10 +0200 |
| commit | 3a9d375328e78e58a20584cc138bd52f930f33b7 (patch) | |
| tree | 1db9a75adc1f3a4e7bd9e431f58d6cde806a7e43 | |
| parent | 5b580e5d65ac5dce9dc07aba4fe1f31226a66ed8 (diff) | |
| download | samba-3a9d375328e78e58a20584cc138bd52f930f33b7.tar.gz samba-3a9d375328e78e58a20584cc138bd52f930f33b7.tar.xz samba-3a9d375328e78e58a20584cc138bd52f930f33b7.zip | |
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>
| -rw-r--r-- | ctdb/common/ctdb_fork.c | 2 | ||||
| -rw-r--r-- | ctdb/common/ctdb_util.c | 6 | ||||
| -rw-r--r-- | ctdb/include/ctdb_private.h | 4 | ||||
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/common/ctdb_fork.c b/ctdb/common/ctdb_fork.c index 1343fd72617..aa9bcf01bc4 100644 --- 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 b2f0ee72af0..5cba124422f 100644 --- 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 4d80415233b..089ef9cb68b 100644 --- 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 2f0aa4a0911..e7a610ea9ec 100644 --- 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 */ |