summaryrefslogtreecommitdiff
path: root/ctdb/ib/ibw_ctdb.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-04-13 20:38:24 +1000
committerAndrew Tridgell <tridge@samba.org>2007-04-13 20:38:24 +1000
commit65cdf2297ac6c5b298ba303660d6aa83cd9d1775 (patch)
treee83f34a2fef8714dff9eb7e61dd1bfc13b95f5a2 /ctdb/ib/ibw_ctdb.c
parentde058569e0c50246d984d6e76a77a8fb747ad760 (diff)
downloadsamba-65cdf2297ac6c5b298ba303660d6aa83cd9d1775.tar.gz
private -> private_data for samba3
(This used to be ctdb commit 080b6901173afb2ad618dd0621876ff478c7d6e5)
Diffstat (limited to 'ctdb/ib/ibw_ctdb.c')
-rw-r--r--ctdb/ib/ibw_ctdb.c10
1 files changed, 5 insertions, 5 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"));