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

fix a bug in new structure handling

Browse Source 
(This used to be ctdb commit 5f248d82717c8094f260ea16292996bb712df947)
This commit is contained in:
Andrew Tridgell 2007-01-29 22:11:16 +11:00
parent 0dd4a16d26
commit d331277659
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ctdb/common/ctdb_call.c
View File

@ -299,6 +299,7 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
/* determine if we are the dmaster for this key. This also
fetches the record data (if any), thus avoiding a 2nd fetch of the data
if the call will be answered locally */
ret = ctdb_ltdb_fetch(ctdb, call.key, &header, &data);
if (ret != 0) {
ctdb_send_error(ctdb, hdr, ret, "ltdb fetch failed in ctdb_request_call");
@ -505,8 +506,10 @@ struct ctdb_call_state *ctdb_call_local_send(struct ctdb_context *ctdb,
state->state = CTDB_CALL_DONE;
state->node = ctdb->nodes[ctdb->vnn];
state->call = *call;
ret = ctdb_call_local(ctdb, &state->call, header, data, ctdb->vnn);
ret = ctdb_call_local(ctdb, call, header, data, ctdb->vnn);
return state;
}
@ -557,11 +560,9 @@ struct ctdb_call_state *ctdb_call_send(struct ctdb_context *ctdb, struct ctdb_ca
memcpy(&state->c->data[0], call->key.dptr, call->key.dsize);
memcpy(&state->c->data[call->key.dsize],
call->call_data.dptr, call->call_data.dsize);
state->call = *call;
state->call.call_data.dptr = &state->c->data[call->key.dsize];
state->call.call_data.dsize = call->call_data.dsize;
state->call.key.dptr = &state->c->data[0];
state->call.key.dsize = call->key.dsize;
state->node = ctdb->nodes[header.dmaster];
state->state = CTDB_CALL_WAIT;