sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

change async.private to async.private_data since private is a reserved

Browse Source 
work in c++

(This used to be ctdb commit 79eb28f6cd5dcc30b04966d202a050eaf98a2552)
This commit is contained in:
Ronnie Sahlberg 2007-09-26 14:25:32 +10:00
parent 0ee8424615
commit 72379ee3eb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/include/ctdb.h
View File

@ -113,7 +113,7 @@ struct ctdb_client_control_state {
*/
struct {
void (*fn)(struct ctdb_client_control_state *);
void *private;
void *private_data;
} async;
};

12
ctdb/server/ctdb_recoverd.c
View File

@ -130,7 +130,7 @@ struct freeze_node_data {
static void freeze_node_callback(struct ctdb_client_control_state *state)
{
struct freeze_node_data *fndata = talloc_get_type(state->async.private, struct freeze_node_data);
struct freeze_node_data *fndata = talloc_get_type(state->async.private_data, struct freeze_node_data);
/* one more node has responded to our freeze node*/
@ -181,7 +181,7 @@ static enum monitor_result freeze_all_nodes(struct ctdb_context *ctdb, struct ct
/* set up the callback functions */
state->async.fn = freeze_node_callback;
state->async.private = fndata;
state->async.private_data = fndata;
/* one more control to wait for to complete */
fndata->count++;
@ -1246,7 +1246,7 @@ struct verify_recmode_normal_data {
static void verify_recmode_normal_callback(struct ctdb_client_control_state *state)
{
struct verify_recmode_normal_data *rmdata = talloc_get_type(state->async.private, struct verify_recmode_normal_data);
struct verify_recmode_normal_data *rmdata = talloc_get_type(state->async.private_data, struct verify_recmode_normal_data);
/* one more node has responded with recmode data*/
@ -1308,7 +1308,7 @@ static enum monitor_result verify_recmode(struct ctdb_context *ctdb, struct ctdb
/* set up the callback functions */
state->async.fn = verify_recmode_normal_callback;
state->async.private = rmdata;
state->async.private_data = rmdata;
/* one more control to wait for to complete */
rmdata->count++;
@ -1336,7 +1336,7 @@ struct verify_recmaster_data {
static void verify_recmaster_callback(struct ctdb_client_control_state *state)
{
struct verify_recmaster_data *rmdata = talloc_get_type(state->async.private, struct verify_recmaster_data);
struct verify_recmaster_data *rmdata = talloc_get_type(state->async.private_data, struct verify_recmaster_data);
/* one more node has responded with recmaster data*/
@ -1399,7 +1399,7 @@ static enum monitor_result verify_recmaster(struct ctdb_context *ctdb, struct ct
/* set up the callback functions */
state->async.fn = verify_recmaster_callback;
state->async.private = rmdata;
state->async.private_data = rmdata;
/* one more control to wait for to complete */
rmdata->count++;