diff options
| author | Ronnie sahlberg <ronniesahlberg@gmail.com> | 2007-04-17 16:43:53 +1000 |
|---|---|---|
| committer | Ronnie sahlberg <ronniesahlberg@gmail.com> | 2007-04-17 16:43:53 +1000 |
| commit | 506fa488b977bc4cedc3669362e7f44cc42cbae1 (patch) | |
| tree | 5ed22f42a3c16517bb2ee679e575fdfba06f4cce /ctdb/common/ctdb_daemon.c | |
| parent | 6a2579cea919b7570e2c166260a097540cf98d2c (diff) | |
| parent | 1a1aedf78f723a61fc88717048440ff7f04f8c5c (diff) | |
| download | samba-506fa488b977bc4cedc3669362e7f44cc42cbae1.tar.gz samba-506fa488b977bc4cedc3669362e7f44cc42cbae1.tar.xz samba-506fa488b977bc4cedc3669362e7f44cc42cbae1.zip | |
merge from tridge
(This used to be ctdb commit 268a89db5886955e290538fdc08d3e94172e3527)
Diffstat (limited to 'ctdb/common/ctdb_daemon.c')
| -rw-r--r-- | ctdb/common/ctdb_daemon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c index 67653202af..aa1f12474a 100644 --- a/ctdb/common/ctdb_daemon.c +++ b/ctdb/common/ctdb_daemon.c @@ -125,7 +125,8 @@ static void daemon_request_register_message_handler(struct ctdb_client *client, static struct ctdb_call_state *ctdb_daemon_fetch_lock_send(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, - TDB_DATA key, TDB_DATA *data) + TDB_DATA key, struct ctdb_ltdb_header *header, + TDB_DATA *data) { struct ctdb_call *call; struct ctdb_record_handle *rec; @@ -141,13 +142,12 @@ static struct ctdb_call_state *ctdb_daemon_fetch_lock_send(struct ctdb_db_contex call->key = key; call->flags = CTDB_IMMEDIATE_MIGRATION; - rec->ctdb_db = ctdb_db; rec->key = key; rec->key.dptr = talloc_memdup(rec, key.dptr, key.dsize); rec->data = data; - state = ctdb_daemon_call_send(ctdb_db, call); + state = ctdb_daemon_call_send_remote(ctdb_db, call, header); state->fetch_private = rec; return state; @@ -192,7 +192,7 @@ static void daemon_fetch_lock_complete(struct ctdb_call_state *state) called when the daemon gets a fetch lock request from a client */ static void daemon_request_fetch_lock(struct ctdb_client *client, - struct ctdb_req_fetch_lock *f) + struct ctdb_req_fetch_lock *f) { struct ctdb_call_state *state; TDB_DATA key, *data; @@ -226,7 +226,7 @@ static void daemon_request_fetch_lock(struct ctdb_client *client, data->dptr = NULL; data->dsize = 0; - state = ctdb_daemon_fetch_lock_send(ctdb_db, client, key, data); + state = ctdb_daemon_fetch_lock_send(ctdb_db, client, key, &f->header, data); talloc_steal(state, data); fl_data = talloc(state, struct client_fetch_lock_data); |