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

ctdb-daemon: Rename struct ctdb_control_pulldb to ctdb_pulldb

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2015-10-28 19:10:53 +11:00 committed by Martin Schwenke
parent f8c2dc3220
commit 64d8bb626b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/client/ctdb_client.c
View File

@ -1668,16 +1668,16 @@ struct ctdb_client_control_state *ctdb_ctrl_pulldb_send(
uint32_t lmaster, TALLOC_CTX *mem_ctx, struct timeval timeout)
{
TDB_DATA indata;
struct ctdb_control_pulldb *pull;
struct ctdb_pulldb *pull;
struct ctdb_client_control_state *state;
pull = talloc(mem_ctx, struct ctdb_control_pulldb);
pull = talloc(mem_ctx, struct ctdb_pulldb);
CTDB_NO_MEMORY_NULL(ctdb, pull);
pull->db_id = dbid;
pull->lmaster = lmaster;
indata.dsize = sizeof(struct ctdb_control_pulldb);
indata.dsize = sizeof(struct ctdb_pulldb);
indata.dptr = (unsigned char *)pull;
state = ctdb_control_send(ctdb, destnode, 0,

2
ctdb/include/ctdb_protocol.h
View File

@ -942,7 +942,7 @@ struct ctdb_node_flag_change {
#define CTDB_LMASTER_ANY 0xffffffff
/* structure used for pulldb control */
struct ctdb_control_pulldb {
struct ctdb_pulldb {
uint32_t db_id;
uint32_t lmaster;
};

2
ctdb/server/ctdb_control.c
View File

@ -193,7 +193,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
return ctdb_control_setvnnmap(ctdb, opcode, indata, outdata);
case CTDB_CONTROL_PULL_DB:
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_pulldb));
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_pulldb));
return ctdb_control_pull_db(ctdb, indata, outdata);
case CTDB_CONTROL_SET_DMASTER:

4
ctdb/server/ctdb_recover.c
View File

@ -247,12 +247,12 @@ static int traverse_pulldb(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
*/
int32_t ctdb_control_pull_db(struct ctdb_context *ctdb, TDB_DATA indata, TDB_DATA *outdata)
{
struct ctdb_control_pulldb *pull;
struct ctdb_pulldb *pull;
struct ctdb_db_context *ctdb_db;
struct pulldb_data params;
struct ctdb_marshall_buffer *reply;
pull = (struct ctdb_control_pulldb *)indata.dptr;
pull = (struct ctdb_pulldb *)indata.dptr;
ctdb_db = find_ctdb_db(ctdb, pull->db_id);
if (!ctdb_db) {