update some calls to ctdb_control() that were still using the old

signature (flags field)

update some calls to ctdb_get_config() to use the new name
ctdb_ctrl_get_config()

change #include "talloc/talloc.h" to #include "lib/talloc/talloc.h" in
lib/events/events.h

(This used to be ctdb commit d2cdd87037b9f0c387228d7d4743da4869929c93)

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index 40857110be71955a5a3dd9171eb3c210c50dda6d..c42b67f1f55672ca909c2a1ada42f14e0b76b958 100644 (file)
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -1030,7 +1030,7 @@ int ctdb_ctrl_copydb(struct ctdb_context *ctdb, uint32_t sourcenode, uint32_t de
        }
 
        ret = ctdb_control(ctdb, destnode, 0, 
-                          CTDB_CONTROL_PUSH_DB, outdata, 
+                          CTDB_CONTROL_PUSH_DB, 0, outdata, 
                           mem_ctx, NULL, &res);
        if (ret != 0 || res != 0) {
                DEBUG(0,(__location__ " ctdb_control for pushdb failed\n"));
@@ -1308,7 +1308,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name)
        
        ctdb_db->db_id = *(uint32_t *)data.dptr;
 
-       ret = ctdb_getdbpath(ctdb, ctdb_db->db_id, ctdb_db, &ctdb_db->db_path);
+       ret = ctdb_ctrl_getdbpath(ctdb, ctdb_db->db_id, ctdb_db, &ctdb_db->db_path);
        if (ret != 0) {
                DEBUG(0,("Failed to get dbpath for database '%s'\n", name));
                talloc_free(ctdb_db);

diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index af6222b4fad36bd74cd918efd09f628570b21a98..1fb560764527bd2169b9cfad8971b1c37298c319 100644 (file)
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@ -653,7 +653,7 @@ int ctdb_start(struct ctdb_context *ctdb)
                close(fd[0]);
                close(ctdb->daemon.sd);
                ctdb->daemon.sd = -1;
-               ctdb_get_config(ctdb);
+               ctdb_ctrl_get_config(ctdb);
                return 0;
        }
 

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index e2528bff4318ebd3407d96421444aaa06ef031c3..30f1607c6697ec009f5b1757653f83a5e0395702 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -276,8 +276,6 @@ struct ctdb_control_set_call {
        uint32_t id;
 };
 
->>>>>>> MERGE-SOURCE
-
 enum call_state {CTDB_CALL_WAIT, CTDB_CALL_DONE, CTDB_CALL_ERROR};
 
 #define CTDB_LMASTER_ANY       0xffffffff

diff --git a/ctdb/lib/events/events.h b/ctdb/lib/events/events.h
index 94dc56055cc116e1d8f3097cb24d56ed3146e443..caeb1f013158eeb265a852ef5610627754d7af45 100644 (file)
--- a/ctdb/lib/events/events.h
+++ b/ctdb/lib/events/events.h
@@ -23,7 +23,7 @@
 #ifndef __EVENTS_H__
 #define __EVENTS_H__
 
-#include "talloc/talloc.h"
+#include "lib/talloc/talloc.h"
 #include <stdlib.h>
 
 struct event_context;