summaryrefslogtreecommitdiff
path: root/source4/cluster/ctdb/common
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-02-09 01:52:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:44:55 -0500
commit8de4c33d8f089f2f47817278f8781f194da898d0 (patch)
tree9072b0efe72d2a17ec4b86cab9969c338419227a /source4/cluster/ctdb/common
parent728ff99fe3b06794937f5398bb2512f0b03e7186 (diff)
downloadsamba-8de4c33d8f089f2f47817278f8781f194da898d0.tar.gz
samba-8de4c33d8f089f2f47817278f8781f194da898d0.tar.bz2
samba-8de4c33d8f089f2f47817278f8781f194da898d0.zip
r21256: - msg_type is not needed in the cluster messaging API
- merge ctdb_get_num_nodes() from bzr tree (This used to be commit 3df7527aedeba7ce2f4a6ca2d3b7167f58c6b68a)
Diffstat (limited to 'source4/cluster/ctdb/common')
-rw-r--r--source4/cluster/ctdb/common/ctdb.c9
-rw-r--r--source4/cluster/ctdb/common/ctdb_message.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/source4/cluster/ctdb/common/ctdb.c b/source4/cluster/ctdb/common/ctdb.c
index 9e92059b95..59a14d4dbd 100644
--- a/source4/cluster/ctdb/common/ctdb.c
+++ b/source4/cluster/ctdb/common/ctdb.c
@@ -162,6 +162,15 @@ uint32_t ctdb_get_vnn(struct ctdb_context *ctdb)
}
/*
+ return the number of nodes
+*/
+uint32_t ctdb_get_num_nodes(struct ctdb_context *ctdb)
+{
+ return ctdb->num_nodes;
+}
+
+
+/*
start the protocol going
*/
int ctdb_start(struct ctdb_context *ctdb)
diff --git a/source4/cluster/ctdb/common/ctdb_message.c b/source4/cluster/ctdb/common/ctdb_message.c
index abdf9e6216..ca909f8994 100644
--- a/source4/cluster/ctdb/common/ctdb_message.c
+++ b/source4/cluster/ctdb/common/ctdb_message.c
@@ -54,7 +54,7 @@ void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
send a ctdb message
*/
int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
- uint32_t srvid, uint32_t msg_type, TDB_DATA data)
+ uint32_t srvid, TDB_DATA data)
{
struct ctdb_req_message *r;
int len;