diff options
author | Peter Somogyi <psomogyi@gamax.hu> | 2007-04-16 16:28:29 +0200 |
---|---|---|
committer | Peter Somogyi <psomogyi@gamax.hu> | 2007-04-16 16:28:29 +0200 |
commit | a32fa3451d407e4abea7ac9a323d890e8bb3b515 (patch) | |
tree | df476d1686a76d56b9b4d732a19aa84eab0cf00d /ctdb/ib | |
parent | a003ee95710288c438477c1f5120ec328eac24ba (diff) | |
parent | 7aa68f96f7ea144761a3fcf0c8fc9a2db3282db0 (diff) | |
download | samba-a32fa3451d407e4abea7ac9a323d890e8bb3b515.tar.gz |
merged tridge's branch
(This used to be ctdb commit 15e18293eaa5ddcd325395213014b5a4498ca309)
Diffstat (limited to 'ctdb/ib')
-rw-r--r-- | ctdb/ib/ibw_ctdb.c | 10 | ||||
-rw-r--r-- | ctdb/ib/ibw_ctdb.h | 2 | ||||
-rw-r--r-- | ctdb/ib/ibw_ctdb_init.c | 12 | ||||
-rw-r--r-- | ctdb/ib/ibwrapper_test.c | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c index 50dd8d68d43..dfe4adc6d3e 100644 --- a/ctdb/ib/ibw_ctdb.c +++ b/ctdb/ib/ibw_ctdb.c @@ -31,7 +31,7 @@ int ctdb_ibw_node_connect(struct ctdb_node *node) { - struct ctdb_ibw_node *cn = talloc_get_type(node->private, struct ctdb_ibw_node); + struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node); int rc; assert(cn!=NULL); @@ -56,9 +56,9 @@ int ctdb_ibw_node_connect(struct ctdb_node *node) } void ctdb_ibw_node_connect_event(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private) + struct timeval t, void *private_data) { - struct ctdb_node *node = talloc_get_type(private, struct ctdb_node); + struct ctdb_node *node = talloc_get_type(private_data, struct ctdb_node); ctdb_ibw_node_connect(node); } @@ -98,7 +98,7 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn) case IBWC_CONNECTED: { /* after ibw_accept or ibw_connect */ struct ctdb_node *node = talloc_get_type(conn->conn_userdata, struct ctdb_node); if (node!=NULL) { /* after ibw_connect */ - struct ctdb_ibw_node *cn = talloc_get_type(node->private, struct ctdb_ibw_node); + struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node); node->ctdb->upcalls->node_connected(node); ctdb_flush_cn_queue(cn); @@ -116,7 +116,7 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn) case IBWC_ERROR: { struct ctdb_node *node = talloc_get_type(conn->conn_userdata, struct ctdb_node); if (node!=NULL) { - struct ctdb_ibw_node *cn = talloc_get_type(node->private, struct ctdb_ibw_node); + struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node); struct ibw_ctx *ictx = cn->conn->ctx; DEBUG(10, ("IBWC_ERROR, reconnecting...\n")); diff --git a/ctdb/ib/ibw_ctdb.h b/ctdb/ib/ibw_ctdb.h index 24adeb7233e..8286eef65aa 100644 --- a/ctdb/ib/ibw_ctdb.h +++ b/ctdb/ib/ibw_ctdb.h @@ -41,6 +41,6 @@ int ctdb_ibw_receive_handler(struct ibw_conn *conn, void *buf, int n); int ctdb_ibw_node_connect(struct ctdb_node *node); void ctdb_ibw_node_connect_event(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private); + struct timeval t, void *private_data); int ctdb_flush_cn_queue(struct ctdb_ibw_node *cn); diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c index 9c0300c4f4c..3b0c6ad28fb 100644 --- a/ctdb/ib/ibw_ctdb_init.c +++ b/ctdb/ib/ibw_ctdb_init.c @@ -31,7 +31,7 @@ static int ctdb_ibw_listen(struct ctdb_context *ctdb, int backlog) { - struct ibw_ctx *ictx = talloc_get_type(ctdb->private, struct ibw_ctx); + struct ibw_ctx *ictx = talloc_get_type(ctdb->private_data, struct ibw_ctx); struct sockaddr_in my_addr; assert(ictx!=NULL); @@ -81,12 +81,12 @@ static int ctdb_ibw_start(struct ctdb_context *ctdb) */ static int ctdb_ibw_add_node(struct ctdb_node *node) { - struct ibw_ctx *ictx = talloc_get_type(node->ctdb->private, struct ibw_ctx); + struct ibw_ctx *ictx = talloc_get_type(node->ctdb->private_data, struct ibw_ctx); struct ctdb_ibw_node *cn = talloc_zero(node, struct ctdb_ibw_node); assert(cn!=NULL); cn->conn = ibw_conn_new(ictx, node); - node->private = (void *)cn; + node->private_data = (void *)cn; return (cn->conn!=NULL ? 0 : -1); } @@ -127,7 +127,7 @@ int ctdb_flush_cn_queue(struct ctdb_ibw_node *cn) static int ctdb_ibw_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t length) { - struct ctdb_ibw_node *cn = talloc_get_type(node->private, struct ctdb_ibw_node); + struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node); int rc; assert(length>=sizeof(uint32_t)); @@ -168,7 +168,7 @@ static void *ctdb_ibw_allocate_pkt(struct ctdb_context *ctdb, size_t size) static int ctdb_ibw_stop(struct ctdb_context *cctx) { - struct ibw_ctx *ictx = talloc_get_type(cctx->private, struct ibw_ctx); + struct ibw_ctx *ictx = talloc_get_type(cctx->private_data, struct ibw_ctx); assert(ictx!=NULL); return ibw_stop(ictx); @@ -207,7 +207,7 @@ int ctdb_ibw_init(struct ctdb_context *ctdb) } ctdb->methods = &ctdb_ibw_methods; - ctdb->private = ictx; + ctdb->private_data = ictx; DEBUG(10, ("ctdb_ibw_init succeeded.\n")); return 0; diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c index 7f91075f3d9..6ef5aa1e679 100644 --- a/ctdb/ib/ibwrapper_test.c +++ b/ctdb/ib/ibwrapper_test.c @@ -378,9 +378,9 @@ error: } void ibwtest_timeout_handler(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private) + struct timeval t, void *private_data) { - struct ibwtest_ctx *tcx = talloc_get_type(private, struct ibwtest_ctx); + struct ibwtest_ctx *tcx = talloc_get_type(private_data, struct ibwtest_ctx); int rc; if (!tcx->is_server) { |