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>

diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index 21315ecdae6bd357c760d4c800db71fd88812a1a..9f599d6884dee0b78d168c9efdd21f5fe50ff6ec 100644 (file)
--- 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 62912fc5e272951947bc712f6de5dd7444c77f6d..9e87976419d78fb75382839aadbb0c473713ba18 100644 (file)
--- 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 3615ce1631930ab34fe7dcc14320c268f4d7d4df..5cd04971f075af33c55a869cd9fbe1945b8aead2 100644 (file)
--- 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);