sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

merge from ronnie

Browse Source 
(This used to be ctdb commit f80c4b02ffb474a4710fa411123448e3ce2d004a)
This commit is contained in:
Andrew Tridgell 2007-05-17 12:46:50 +10:00
commit fb77fd0bed
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctdb/common/ctdb_client.c
View File

@ -1109,7 +1109,6 @@ int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid
keys->keys = talloc_array(mem_ctx, TDB_DATA, keys->num);
keys->headers = talloc_array(mem_ctx, struct ctdb_ltdb_header, keys->num);
keys->lmasters = talloc_array(mem_ctx, uint32_t, keys->num);
keys->data = talloc_array(mem_ctx, TDB_DATA, keys->num);
rec = (struct ctdb_rec_data *)&reply->data[0];
@ -1117,7 +1116,7 @@ int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid
for (i=0;i<reply->count;i++) {
keys->keys[i].dptr = talloc_memdup(mem_ctx, &rec->data[0], rec->keylen);
keys->keys[i].dsize = rec->keylen;
keys->data[i].dptr = talloc_memdup(mem_ctx, &rec->data[keys->keys[i].dsize], rec->datalen);
keys->data[i].dsize = rec->datalen;

1
ctdb/include/ctdb.h
View File

@ -244,7 +244,6 @@ struct ctdb_key_list {
uint32_t num;
TDB_DATA *keys;
struct ctdb_ltdb_header *headers;
uint32_t *lmasters;
TDB_DATA *data;
};
int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid, uint32_t lmaster, TALLOC_CTX *mem_ctx, struct ctdb_key_list *keys);

4
ctdb/tools/ctdb_control.c
View File

@ -513,8 +513,8 @@ static int control_catdb(struct ctdb_context *ctdb, int argc, const char **argv)
keystr = hex_encode(ctdb, keys.keys[i].dptr, keys.keys[i].dsize);
datastr = hex_encode(ctdb, keys.data[i].dptr, keys.data[i].dsize);
printf("rsn:%llu lmaster:%d dmaster:%d key:%s data:%s\n",
(unsigned long long)keys.headers[i].rsn, keys.lmasters[i],
printf("rsn:%llu dmaster:%d key:%s data:%s\n",
(unsigned long long)keys.headers[i].rsn,
keys.headers[i].dmaster, keystr, datastr);
ret++;
}