diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-08-06 21:30:34 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2020-09-11 05:06:42 +0000 |
| commit | 7d826731d484f79443635feb0eb9e989d893b068 (patch) | |
| tree | 115702a75c9625fbf6e098765d8cd9526e2350fe /ctdb/protocol | |
| parent | 3bbb4a85357ce9dcf62f0efab7c6b3cdbd21f6c7 (diff) | |
| download | samba-7d826731d484f79443635feb0eb9e989d893b068.tar.gz | |
ctdb-protocol: Drop marshalling functions for old-style database pull/push
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/protocol')
| -rw-r--r-- | ctdb/protocol/protocol_control.c | 48 | ||||
| -rw-r--r-- | ctdb/protocol/protocol_debug.c | 2 |
2 files changed, 0 insertions, 50 deletions
diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c index 4fd5a5a7d4d..fb6b0219ef7 100644 --- a/ctdb/protocol/protocol_control.c +++ b/ctdb/protocol/protocol_control.c @@ -68,14 +68,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd) case CTDB_CONTROL_GET_DBMAP: break; - case CTDB_CONTROL_PULL_DB: - len = ctdb_pulldb_len(cd->data.pulldb); - break; - - case CTDB_CONTROL_PUSH_DB: - len = ctdb_rec_buffer_len(cd->data.recbuf); - break; - case CTDB_CONTROL_GET_RECMODE: break; @@ -447,14 +439,6 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd, ctdb_uint32_push(&cd->data.loglevel, buf, &np); break; - case CTDB_CONTROL_PULL_DB: - ctdb_pulldb_push(cd->data.pulldb, buf, &np); - break; - - case CTDB_CONTROL_PUSH_DB: - ctdb_rec_buffer_push(cd->data.recbuf, buf, &np); - break; - case CTDB_CONTROL_SET_RECMODE: ctdb_uint32_push(&cd->data.recmode, buf, &np); break; @@ -741,16 +725,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen, ret = ctdb_uint32_pull(buf, buflen, &cd->data.loglevel, &np); break; - case CTDB_CONTROL_PULL_DB: - ret = ctdb_pulldb_pull(buf, buflen, mem_ctx, - &cd->data.pulldb, &np); - break; - - case CTDB_CONTROL_PUSH_DB: - ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx, - &cd->data.recbuf, &np); - break; - case CTDB_CONTROL_SET_RECMODE: ret = ctdb_uint32_pull(buf, buflen, &cd->data.recmode, &np); break; @@ -1102,13 +1076,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd) len = ctdb_dbid_map_len(cd->data.dbmap); break; - case CTDB_CONTROL_PULL_DB: - len = ctdb_rec_buffer_len(cd->data.recbuf); - break; - - case CTDB_CONTROL_PUSH_DB: - break; - case CTDB_CONTROL_GET_RECMODE: break; @@ -1449,13 +1416,6 @@ static void ctdb_reply_control_data_push(struct ctdb_reply_control_data *cd, ctdb_dbid_map_push(cd->data.dbmap, buf, &np); break; - case CTDB_CONTROL_PULL_DB: - ctdb_rec_buffer_push(cd->data.recbuf, buf, &np); - break; - - case CTDB_CONTROL_PUSH_DB: - break; - case CTDB_CONTROL_DB_ATTACH: ctdb_uint32_push(&cd->data.db_id, buf, &np); break; @@ -1622,14 +1582,6 @@ static int ctdb_reply_control_data_pull(uint8_t *buf, size_t buflen, &cd->data.dbmap, &np); break; - case CTDB_CONTROL_PULL_DB: - ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx, - &cd->data.recbuf, &np); - break; - - case CTDB_CONTROL_PUSH_DB: - break; - case CTDB_CONTROL_DB_ATTACH: ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np); break; diff --git a/ctdb/protocol/protocol_debug.c b/ctdb/protocol/protocol_debug.c index 56f14e32b09..694285515e1 100644 --- a/ctdb/protocol/protocol_debug.c +++ b/ctdb/protocol/protocol_debug.c @@ -114,8 +114,6 @@ static void ctdb_opcode_print(uint32_t opcode, FILE *fp) { CTDB_CONTROL_GET_DBMAP, "GET_DBMAP" }, { CTDB_CONTROL_GET_NODEMAPv4, "GET_NODEMAPv4" }, { CTDB_CONTROL_SET_DMASTER, "SET_DMASTER" }, - { CTDB_CONTROL_PULL_DB, "PULL_DB" }, - { CTDB_CONTROL_PUSH_DB, "PUSH_DB" }, { CTDB_CONTROL_GET_RECMODE, "GET_RECMODE" }, { CTDB_CONTROL_SET_RECMODE, "SET_RECMODE" }, { CTDB_CONTROL_STATISTICS_RESET, "STATISTICS_RESET" }, |