diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-05-06 18:52:54 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-07-23 09:44:00 +0200 |
| commit | f87b7f664f813957ee55a6f35abb208eb0f3dcad (patch) | |
| tree | 1613ccc43ebc99233564a6bd75c97205e83fbe18 | |
| parent | 6edc4f23e9094860ad5cc6b93ce66169dd99047a (diff) | |
| download | samba-f87b7f664f813957ee55a6f35abb208eb0f3dcad.tar.gz samba-f87b7f664f813957ee55a6f35abb208eb0f3dcad.tar.xz samba-f87b7f664f813957ee55a6f35abb208eb0f3dcad.zip | |
ctdb-vacuum: Use existing function ctdb_marshall_finish
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Wed Jul 23 09:44:00 CEST 2014 on sn-devel-104
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 7 | ||||
| -rw-r--r-- | ctdb/server/ctdb_vacuum.c | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index aa6abbeaaa..ecf3aba301 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -1092,8 +1092,7 @@ int32_t ctdb_control_try_delete_records(struct ctdb_context *ctdb, TDB_DATA inda } - outdata->dptr = (uint8_t *)records; - outdata->dsize = talloc_get_size(records); + *outdata = ctdb_marshall_finish(records); return 0; } @@ -1290,9 +1289,7 @@ int32_t ctdb_control_receive_records(struct ctdb_context *ctdb, rec = (struct ctdb_rec_data *)(rec->length + (uint8_t *)rec); } - - outdata->dptr = (uint8_t *)records; - outdata->dsize = talloc_get_size(records); + *outdata = ctdb_marshall_finish(records); return 0; } diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index fe59a83fcf..be3ee1e8b4 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/server/ctdb_vacuum.c @@ -775,8 +775,7 @@ static void ctdb_process_vacuum_fetch_lists(struct ctdb_db_context *ctdb_db, vfl->count, ctdb->nodes[i]->pnn, ctdb_db->db_name)); - data.dsize = talloc_get_size(vfl); - data.dptr = (void *)vfl; + data = ctdb_marshall_finish(vfl); if (ctdb_client_send_message(ctdb, ctdb->nodes[i]->pnn, CTDB_SRVID_VACUUM_FETCH, data) != 0) @@ -901,8 +900,7 @@ static void ctdb_process_delete_list(struct ctdb_db_context *ctdb_db, "delete list for first marshalling.\n")); } - indata.dsize = talloc_get_size(recs->records); - indata.dptr = (void *)recs->records; + indata = ctdb_marshall_finish(recs->records); for (i = 0; i < num_active_nodes; i++) { struct ctdb_marshall_buffer *records; @@ -1009,8 +1007,7 @@ static void ctdb_process_delete_list(struct ctdb_db_context *ctdb_db, goto done; } - indata.dsize = talloc_get_size(recs->records); - indata.dptr = (void *)recs->records; + indata = ctdb_marshall_finish(recs->records); for (i = 0; i < num_active_nodes; i++) { struct ctdb_marshall_buffer *records; |