use ctdb_call_info, so struct ctdb_call can be used for top level call

(This used to be ctdb commit 05565ce504b75671566661199f5203a9ace31583)

diff --git a/ctdb/common/ctdb_call.c b/ctdb/common/ctdb_call.c
index 9b21ce7cb21ede602c7ff03240fc7d3e358bb24c..923b423716b66f6582114d377052c1c7ebbd3bc4 100644 (file)
--- a/ctdb/common/ctdb_call.c
+++ b/ctdb/common/ctdb_call.c
@@ -49,10 +49,10 @@ static int ctdb_call_local(struct ctdb_context *ctdb, TDB_DATA key,
                           int call_id, TDB_DATA *call_data, TDB_DATA *reply_data,
                           uint32_t caller)
 {
-       struct ctdb_call *c;
+       struct ctdb_call_info *c;
        struct ctdb_registered_call *fn;
 
-       c = talloc(ctdb, struct ctdb_call);
+       c = talloc(ctdb, struct ctdb_call_info);
        CTDB_NO_MEMORY(ctdb, c);
 
        c->key = key;

diff --git a/ctdb/ctdb_bench.c b/ctdb/ctdb_bench.c
index 01a8cc0f150a5729d612eb76693463cddcc806e0..7a9db5b2e180926436c17edb67b57b21b5d8f812 100644 (file)
--- a/ctdb/ctdb_bench.c
+++ b/ctdb/ctdb_bench.c
@@ -50,7 +50,7 @@ enum my_functions {FUNC_INCR=1, FUNC_FETCH=2};
 /*
   ctdb call function to increment an integer
 */
-static int incr_func(struct ctdb_call *call)
+static int incr_func(struct ctdb_call_info *call)
 {
        if (call->record_data.dsize == 0) {
                call->new_data = talloc(call, TDB_DATA);
@@ -70,7 +70,7 @@ static int incr_func(struct ctdb_call *call)
 /*
   ctdb call function to fetch a record
 */
-static int fetch_func(struct ctdb_call *call)
+static int fetch_func(struct ctdb_call_info *call)
 {
        call->reply_data = &call->record_data;
        return 0;

diff --git a/ctdb/ctdb_test.c b/ctdb/ctdb_test.c
index 5bc35ad332228ebbcbe727f1c5c5454992328073..7f3430ad1aa33cdb79031bc4590b7a98698cc713 100644 (file)
--- a/ctdb/ctdb_test.c
+++ b/ctdb/ctdb_test.c
@@ -33,7 +33,7 @@ static int int_compare(int *i1, int *i2)
 /*
   add an integer into a record in sorted order
 */
-static int sort_func(struct ctdb_call *call)
+static int sort_func(struct ctdb_call_info *call)
 {
        if (call->call_data == NULL ||
            call->call_data->dsize != sizeof(int)) {
@@ -64,7 +64,7 @@ static int sort_func(struct ctdb_call *call)
 /*
   ctdb call function to fetch a record
 */
-static int fetch_func(struct ctdb_call *call)
+static int fetch_func(struct ctdb_call_info *call)
 {
        call->reply_data = &call->record_data;
        return 0;

diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h
index f2f4bcef84da83e82106002bcf4683cafdeaec6c..4683cde3888d861e1ae93a6ce6c76b461a927f96 100644 (file)
--- a/ctdb/include/ctdb.h
+++ b/ctdb/include/ctdb.h
@@ -24,7 +24,7 @@
 /*
   structure passed to a ctdb call function
 */
-struct ctdb_call {
+struct ctdb_call_info {
        TDB_DATA key;          /* record key */
        TDB_DATA record_data;  /* current data in the record */
        TDB_DATA *new_data;    /* optionally updated record data */
@@ -85,7 +85,7 @@ int ctdb_start(struct ctdb_context *ctdb);
 const char *ctdb_errstr(struct ctdb_context *);
 
 /* a ctdb call function */
-typedef int (*ctdb_fn_t)(struct ctdb_call *);
+typedef int (*ctdb_fn_t)(struct ctdb_call_info *);
 
 /*
   setup a ctdb call function