diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-06-06 15:24:20 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-06-12 05:40:10 +0200 |
| commit | 4736486188afb8ff6243bcc8a27daa9dbcc64b7a (patch) | |
| tree | 4152d0a3834113f0e42e729e0f38781fed3409b6 | |
| parent | 507207e40b193ba753604666c56dfa29c29b7145 (diff) | |
| download | samba-4736486188afb8ff6243bcc8a27daa9dbcc64b7a.tar.gz samba-4736486188afb8ff6243bcc8a27daa9dbcc64b7a.tar.xz samba-4736486188afb8ff6243bcc8a27daa9dbcc64b7a.zip | |
ctdb-daemon: Rename ctdb_mkdir_p_or_die to mkdir_p_or_die
This function does not require ctdb context.
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/ctdbd.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index 21315ecdae..9f599d6884 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -471,7 +471,7 @@ void ctdb_set_runstate(struct ctdb_context *ctdb, enum ctdb_runstate runstate) ctdb->runstate = runstate; } -void ctdb_mkdir_p_or_die(struct ctdb_context *ctdb, const char *dir, int mode) +void mkdir_p_or_die(const char *dir, int mode) { int ret; diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 62912fc5e2..9e87976419 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -1604,6 +1604,6 @@ struct lock_request *ctdb_lock_alldb(struct ctdb_context *ctdb, void *private_data); int mkdir_p(const char *dir, int mode); -void ctdb_mkdir_p_or_die(struct ctdb_context *ctdb, const char *dir, int mode); +void mkdir_p_or_die(const char *dir, int mode); #endif diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 3615ce1631..5cd04971f0 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -256,13 +256,13 @@ int main(int argc, const char *argv[]) ctdb_load_nodes_file(ctdb); ctdb->db_directory = options.db_dir; - ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory, 0700); + mkdir_p_or_die(ctdb->db_directory, 0700); ctdb->db_directory_persistent = options.db_dir_persistent; - ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory_persistent, 0700); + mkdir_p_or_die(ctdb->db_directory_persistent, 0700); ctdb->db_directory_state = options.db_dir_state; - ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory_state, 0700); + mkdir_p_or_die(ctdb->db_directory_state, 0700); if (options.public_interface) { ctdb->default_public_interface = talloc_strdup(ctdb, options.public_interface); |