sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

ctdb-daemon: Rename ctdb_control_wipe_database to ctdb_control_transdb

Browse Source 
The same structure is required in new controls for database transactions.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2015-09-09 15:02:49 +10:00 committed by Amitay Isaacs
parent 9f779f130f
commit 4f155e77a8
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/include/ctdb_private.h
View File

@ -936,7 +936,7 @@ struct ctdb_control_list_tunable {
};
struct ctdb_control_wipe_database {
struct ctdb_control_transdb {
uint32_t db_id;
uint32_t transaction_id;
};

2
ctdb/server/ctdb_control.c
View File

@ -442,7 +442,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
return ctdb_control_transaction_commit(ctdb, *(uint32_t *)indata.dptr);
case CTDB_CONTROL_WIPE_DATABASE:
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_wipe_database));
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_transdb));
return ctdb_control_wipe_database(ctdb, indata);
case CTDB_CONTROL_UPTIME:

2
ctdb/server/ctdb_freeze.c
View File

@ -714,7 +714,7 @@ fail:
*/
int32_t ctdb_control_wipe_database(struct ctdb_context *ctdb, TDB_DATA indata)
{
struct ctdb_control_wipe_database w = *(struct ctdb_control_wipe_database *)indata.dptr;
struct ctdb_control_transdb w = *(struct ctdb_control_transdb *)indata.dptr;
struct ctdb_db_context *ctdb_db;
ctdb_db = find_ctdb_db(ctdb, w.db_id);

2
ctdb/server/ctdb_recoverd.c
View File

@ -1490,7 +1490,7 @@ static int recover_database(struct ctdb_recoverd *rec,
int ret;
struct ctdb_context *ctdb = rec->ctdb;
TDB_DATA data;
struct ctdb_control_wipe_database w;
struct ctdb_control_transdb w;
uint32_t *nodes;
recdb = create_recdb(ctdb, mem_ctx);

4
ctdb/tools/ctdb.c
View File

@ -5581,7 +5581,7 @@ static int control_restoredb(struct ctdb_context *ctdb, int argc, const char **a
struct ctdb_node_map *nodemap=NULL;
struct ctdb_vnn_map *vnnmap=NULL;
int i, fh;
struct ctdb_control_wipe_database w;
struct ctdb_control_transdb w;
uint32_t *nodes;
uint32_t generation;
struct tm *tm;
@ -5861,7 +5861,7 @@ static int control_wipedb(struct ctdb_context *ctdb, int argc,
struct ctdb_node_map *nodemap = NULL;
struct ctdb_vnn_map *vnnmap = NULL;
int i;
struct ctdb_control_wipe_database w;
struct ctdb_control_transdb w;
uint32_t *nodes;
uint32_t generation;
uint8_t flags;