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)

diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c
index 4be52b8233bd12c4b623c8696b113be737e7f604..dab39c1feaa0f9ba33a93613f6caf3703c513d33 100644 (file)
--- a/source4/cluster/cluster.c
+++ b/source4/cluster/cluster.c
@@ -89,8 +89,8 @@ NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id se
 /*
   send a message to another node in the cluster
 */
-NTSTATUS cluster_message_send(struct server_id server, uint32_t msg_type, DATA_BLOB *data)
+NTSTATUS cluster_message_send(struct server_id server, DATA_BLOB *data)
 {
        cluster_init();
-       return ops->message_send(ops, server, msg_type, data);
+       return ops->message_send(ops, server, data);
 }

diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h
index d182bf5526211d6dd3d75570c420c49a04ac4d27..29a5d4d092300d4248eacc1c7a0e69d5d19feec9 100644 (file)
--- a/source4/cluster/cluster.h
+++ b/source4/cluster/cluster.h
@@ -44,6 +44,6 @@ void *cluster_backend_handle(void);
 
 NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id server,
                              cluster_message_fn_t handler);
-NTSTATUS cluster_message_send(struct server_id server, uint32_t msg_type, DATA_BLOB *data);
+NTSTATUS cluster_message_send(struct server_id server, DATA_BLOB *data);
 
 #endif

diff --git a/source4/cluster/cluster_private.h b/source4/cluster/cluster_private.h
index 2dc749d890c8940c44d130bea65827a7ef636e2e..df8848fe73652a91c7219668cb0892fb97513b39 100644 (file)
--- a/source4/cluster/cluster_private.h
+++ b/source4/cluster/cluster_private.h
@@ -34,8 +34,7 @@ struct cluster_ops {
                                 struct messaging_context *msg, struct server_id server,
                                 cluster_message_fn_t handler);
        NTSTATUS (*message_send)(struct cluster_ops *ops,
-                                struct server_id server, uint32_t msg_type, 
-                                DATA_BLOB *data);      
+                                struct server_id server, DATA_BLOB *data);     
        void *private; /* backend state */
 };
 

diff --git a/source4/cluster/ctdb/common/ctdb.c b/source4/cluster/ctdb/common/ctdb.c
index 9e92059b950e373952746945d7081e1638d61318..59a14d4dbdc19ee25befe0377591d9cf342c419d 100644 (file)
--- a/source4/cluster/ctdb/common/ctdb.c
+++ b/source4/cluster/ctdb/common/ctdb.c
@@ -161,6 +161,15 @@ uint32_t ctdb_get_vnn(struct ctdb_context *ctdb)
        return ctdb->vnn;
 }
 
+/*
+  return the number of nodes
+*/
+uint32_t ctdb_get_num_nodes(struct ctdb_context *ctdb)
+{
+       return ctdb->num_nodes;
+}
+
+
 /*
   start the protocol going
 */

diff --git a/source4/cluster/ctdb/common/ctdb_message.c b/source4/cluster/ctdb/common/ctdb_message.c
index abdf9e6216768a57af419309a8cdf7c77d5e9e3f..ca909f899417a0d00393942c8ee710bcf2451bab 100644 (file)
--- 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;

diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c
index 95adbafadff6718b51880f7cba9b72abb4d82de0..917a56d2b8cd0eba88c17fc74b395d888afce7d9 100644 (file)
--- a/source4/cluster/ctdb/ctdb_cluster.c
+++ b/source4/cluster/ctdb/ctdb_cluster.c
@@ -159,8 +159,7 @@ static NTSTATUS ctdb_message_init(struct cluster_ops *ops,
   send a ctdb message to another node
 */
 static NTSTATUS ctdb_message_send(struct cluster_ops *ops,
-                                 struct server_id server, uint32_t msg_type, 
-                                 DATA_BLOB *data)
+                                 struct server_id server, DATA_BLOB *data)
 {
        struct cluster_state *state = ops->private;
        struct ctdb_context *ctdb = state->ctdb;
@@ -170,7 +169,7 @@ static NTSTATUS ctdb_message_send(struct cluster_ops *ops,
        tdata.dptr = data->data;
        tdata.dsize = data->length;
 
-       ret = ctdb_send_message(ctdb, server.node, server.id, msg_type, tdata);
+       ret = ctdb_send_message(ctdb, server.node, server.id, tdata);
        if (ret != 0) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }

diff --git a/source4/cluster/ctdb/include/ctdb.h b/source4/cluster/ctdb/include/ctdb.h
index 335af83215a0d58310e27a6ba19e95cb74c27b21..efb12c5daac46d16e27b7af40af6d6defc763794 100644 (file)
--- a/source4/cluster/ctdb/include/ctdb.h
+++ b/source4/cluster/ctdb/include/ctdb.h
@@ -127,6 +127,11 @@ void ctdb_wait_loop(struct ctdb_context *ctdb);
 /* return vnn of this node */
 uint32_t ctdb_get_vnn(struct ctdb_context *ctdb);
 
+/*
+  return the number of nodes
+*/
+uint32_t ctdb_get_num_nodes(struct ctdb_context *ctdb);
+
 /* setup a handler for ctdb messages */
 typedef void (*ctdb_message_fn_t)(struct ctdb_context *, uint32_t srvid, 
                                  TDB_DATA data, void *);
@@ -135,6 +140,6 @@ int ctdb_set_message_handler(struct ctdb_context *ctdb, ctdb_message_fn_t handle
 
 /* 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);
 
 #endif

diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index 338bac500a78995a162bc22f2d5f80ce269f2bce..5d0df475d72efb056ef70a4782e8b0039a7e8cc0 100644 (file)
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -88,8 +88,7 @@ static NTSTATUS local_message_init(struct cluster_ops *ops,
   dummy message send
 */
 static NTSTATUS local_message_send(struct cluster_ops *ops,
-                                  struct server_id server, uint32_t msg_type, 
-                                  DATA_BLOB *data)
+                                  struct server_id server, DATA_BLOB *data)
 {
        return NT_STATUS_INVALID_DEVICE_REQUEST;
 }

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 03bfb6b571f7820770bd06900f8d3aa25d9dd435..04b340eb5a12b86de8edbeae610a397af8faf186 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -430,7 +430,7 @@ NTSTATUS messaging_send(struct messaging_context *msg, struct server_id server,
        if (!cluster_node_equal(&msg->server_id, &server)) {
                /* the destination is on another node - dispatch via
                   the cluster layer */
-               status = cluster_message_send(server, msg_type, &rec->packet);
+               status = cluster_message_send(server, &rec->packet);
                talloc_free(rec);
                return status;
        }