sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-protocol: Do not pass tdb open flags to DB attach controls

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Mon Jun 26 20:10:38 CEST 2017 on sn-devel-144
This commit is contained in:
Amitay Isaacs 2017-03-21 15:02:56 +11:00 committed by Martin Schwenke
parent 4760fff3ae
commit bcfa12c5b2
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/client/client_control_sync.c
View File

@ -421,7 +421,7 @@ int ctdb_ctrl_db_attach(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct ctdb_reply_control *reply;
int ret;
ctdb_req_control_db_attach(&request, db_name, 0);
ctdb_req_control_db_attach(&request, db_name);
ret = ctdb_client_control(mem_ctx, ev, client, destnode, timeout,
&request, &reply);
if (ret != 0) {
@ -1126,7 +1126,7 @@ int ctdb_ctrl_db_attach_persistent(TALLOC_CTX *mem_ctx,
struct ctdb_reply_control *reply;
int ret;
ctdb_req_control_db_attach_persistent(&request, db_name, 0);
ctdb_req_control_db_attach_persistent(&request, db_name);
ret = ctdb_client_control(mem_ctx, ev, client, destnode, timeout,
&request, &reply);
if (ret != 0) {

4
ctdb/client/client_db.c
View File

@ -305,9 +305,9 @@ struct tevent_req *ctdb_attach_send(TALLOC_CTX *mem_ctx,
if (state->db->persistent) {
ctdb_req_control_db_attach_persistent(&request,
state->db->db_name, 0);
state->db->db_name);
} else {
ctdb_req_control_db_attach(&request, state->db->db_name, 0);
ctdb_req_control_db_attach(&request, state->db->db_name);
}
subreq = ctdb_client_control_send(state, state->ev, state->client,

5
ctdb/protocol/protocol_api.h
View File

@ -237,7 +237,7 @@ void ctdb_req_control_statistics_reset(struct ctdb_req_control *request);
int ctdb_reply_control_statistics_reset(struct ctdb_reply_control *reply);
void ctdb_req_control_db_attach(struct ctdb_req_control *request,
const char *db_name, uint32_t tdb_flags);
const char *db_name);
int ctdb_reply_control_db_attach(struct ctdb_reply_control *reply,
uint32_t *db_id);
@ -346,8 +346,7 @@ void ctdb_req_control_set_tcp_tickle_list(struct ctdb_req_control *request,
int ctdb_reply_control_set_tcp_tickle_list(struct ctdb_reply_control *reply);
void ctdb_req_control_db_attach_persistent(struct ctdb_req_control *request,
const char *name,
uint32_t tdb_flags);
const char *name);
int ctdb_reply_control_db_attach_persistent(struct ctdb_reply_control *reply,
uint32_t *db_id);

9
ctdb/protocol/protocol_client.c
View File

@ -399,11 +399,11 @@ int ctdb_reply_control_statistics_reset(struct ctdb_reply_control *reply)
/* CTDB_CONTROL_DB_ATTACH */
void ctdb_req_control_db_attach(struct ctdb_req_control *request,
const char *db_name, uint32_t tdb_flags)
const char *db_name)
{
request->opcode = CTDB_CONTROL_DB_ATTACH;
request->pad = 0;
request->srvid = tdb_flags;
request->srvid = 0;
request->client_id = 0;
request->flags = 0;
@ -999,12 +999,11 @@ int ctdb_reply_control_set_tcp_tickle_list(struct ctdb_reply_control *reply)
/* CTDB_CONTROL_DB_ATTACH_PERSISTENT */
void ctdb_req_control_db_attach_persistent(struct ctdb_req_control *request,
const char *db_name,
uint32_t tdb_flags)
const char *db_name)
{
request->opcode = CTDB_CONTROL_DB_ATTACH_PERSISTENT;
request->pad = 0;
request->srvid = tdb_flags;
request->srvid = 0;
request->client_id = 0;
request->flags = 0;