ctdb-protocol: Drop code related to obsolete controls

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c
index a461ff36016126b4c3d19491b721170e1b584c0f..2617c7a3d9f0628ff688cabc5a78fb7b9255da6f 100644 (file)
--- a/ctdb/protocol/protocol_client.c
+++ b/ctdb/protocol/protocol_client.c
@@ -424,8 +424,6 @@ int ctdb_reply_control_db_attach(struct ctdb_reply_control *reply,
        return reply->status;
 }
 
-/* CTDB_CONTROL_SET_CALL */
-
 /* CTDB_CONTROL_TRAVERSE_START */
 
 void ctdb_req_control_traverse_start(struct ctdb_req_control *request,
@@ -718,8 +716,6 @@ int ctdb_reply_control_shutdown(struct ctdb_reply_control *reply)
        return ctdb_reply_control_generic(reply, CTDB_CONTROL_SHUTDOWN);
 }
 
-/* CTDB_CONTROL_GET_MONMODE */
-
 /* CTDB_CONTROL_TCP_CLIENT */
 
 void ctdb_req_control_tcp_client(struct ctdb_req_control *request,
@@ -1170,9 +1166,6 @@ int ctdb_reply_control_try_delete_records(struct ctdb_reply_control *reply,
        return reply->status;
 }
 
-/* CTDB_CONTROL_ENABLE_MONITOR */
-/* CTDB_CONTROL_DISABLE_MONITOR */
-
 /* CTDB_CONTROL_ADD_PUBLIC_IP */
 
 void ctdb_req_control_add_public_ip(struct ctdb_req_control *request,
@@ -1855,8 +1848,6 @@ int ctdb_reply_control_set_db_readonly(struct ctdb_reply_control *reply)
        return ctdb_reply_control_generic(reply, CTDB_CONTROL_SET_DB_READONLY);
 }
 
-/* CTDB_CONTROL_CHECK_SRVIDS */
-
 /* CTDB_CONTROL_TRAVERSE_START_EXT */
 
 void ctdb_req_control_traverse_start_ext(struct ctdb_req_control *request,

diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c
index 0b88b5c8b5a5016fe5bc0585e67a53c63d0a70ae..b2d17611108a1e0b346a6336ee2b7e1596034583 100644 (file)
--- a/ctdb/protocol/protocol_control.c
+++ b/ctdb/protocol/protocol_control.c
@@ -90,9 +90,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
                len = ctdb_string_len(&cd->data.db_name);
                break;
 
-       case CTDB_CONTROL_SET_CALL:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START:
                len = ctdb_traverse_start_len(cd->data.traverse_start);
                break;
@@ -145,9 +142,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
        case CTDB_CONTROL_SHUTDOWN:
                break;
 
-       case CTDB_CONTROL_GET_MONMODE:
-               break;
-
        case CTDB_CONTROL_TCP_CLIENT:
                len = ctdb_connection_len(cd->data.conn);
                break;
@@ -221,12 +215,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
                len = ctdb_rec_buffer_len(cd->data.recbuf);
                break;
 
-       case CTDB_CONTROL_ENABLE_MONITOR:
-               break;
-
-       case CTDB_CONTROL_DISABLE_MONITOR:
-               break;
-
        case CTDB_CONTROL_ADD_PUBLIC_IP:
                len = ctdb_addr_info_len(cd->data.addr_info);
                break;
@@ -338,9 +326,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
                len = ctdb_uint32_len(&cd->data.db_id);
                break;
 
-       case CTDB_CONTROL_CHECK_SRVIDS:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START_EXT:
                len = ctdb_traverse_start_ext_len(cd->data.traverse_start_ext);
                break;
@@ -466,9 +451,6 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
                ctdb_string_push(&cd->data.db_name, buf, &np);
                break;
 
-       case CTDB_CONTROL_SET_CALL:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START:
                ctdb_traverse_start_push(cd->data.traverse_start, buf, &np);
                break;
@@ -635,9 +617,6 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
                ctdb_uint32_push(&cd->data.db_id, buf, &np);
                break;
 
-       case CTDB_CONTROL_CHECK_SRVIDS:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START_EXT:
                ctdb_traverse_start_ext_push(cd->data.traverse_start_ext, buf,
                                             &np);
@@ -757,9 +736,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
                                       &cd->data.db_name, &np);
                break;
 
-       case CTDB_CONTROL_SET_CALL:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START:
                ret = ctdb_traverse_start_pull(buf, buflen, mem_ctx,
                                               &cd->data.traverse_start, &np);
@@ -957,9 +933,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
                ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
                break;
 
-       case CTDB_CONTROL_CHECK_SRVIDS:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START_EXT:
                ret = ctdb_traverse_start_ext_pull(buf, buflen, mem_ctx,
                                                   &cd->data.traverse_start_ext,
@@ -1104,9 +1077,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
                len = ctdb_uint32_len(&cd->data.db_id);
                break;
 
-       case CTDB_CONTROL_SET_CALL:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START:
                break;
 
@@ -1154,9 +1124,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
        case CTDB_CONTROL_SHUTDOWN:
                break;
 
-       case CTDB_CONTROL_GET_MONMODE:
-               break;
-
        case CTDB_CONTROL_TCP_CLIENT:
                break;
 
@@ -1224,12 +1191,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
                len = ctdb_rec_buffer_len(cd->data.recbuf);
                break;
 
-       case CTDB_CONTROL_ENABLE_MONITOR:
-               break;
-
-       case CTDB_CONTROL_DISABLE_MONITOR:
-               break;
-
        case CTDB_CONTROL_ADD_PUBLIC_IP:
                break;
 
@@ -1286,12 +1247,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
                len = ctdb_ban_state_len(cd->data.ban_state);
                break;
 
-       case CTDB_CONTROL_SET_DB_PRIORITY:
-               break;
-
-       case CTDB_CONTROL_GET_DB_PRIORITY:
-               break;
-
        case CTDB_CONTROL_REGISTER_NOTIFY:
                break;
 
@@ -1336,9 +1291,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
        case CTDB_CONTROL_SET_DB_READONLY:
                break;
 
-       case CTDB_CONTROL_CHECK_SRVIDS:
-               break;
-
        case CTDB_CONTROL_TRAVERSE_START_EXT:
                break;
 
@@ -1515,9 +1467,6 @@ static void ctdb_reply_control_data_push(struct ctdb_reply_control_data *cd,
                ctdb_ban_state_push(cd->data.ban_state, buf, &np);
                break;
 
-       case CTDB_CONTROL_GET_DB_PRIORITY:
-               break;
-
        case CTDB_CONTROL_GET_DB_SEQNUM:
                ctdb_uint64_push(&cd->data.seqnum, buf, &np);
                break;
@@ -1538,9 +1487,6 @@ static void ctdb_reply_control_data_push(struct ctdb_reply_control_data *cd,
                ctdb_statistics_list_push(cd->data.stats_list, buf, &np);
                break;
 
-       case CTDB_CONTROL_CHECK_SRVIDS:
-               break;
-
        case CTDB_CONTROL_GET_DB_STATISTICS:
                ctdb_db_statistics_push(cd->data.dbstats, buf, &np);
                break;
@@ -1697,9 +1643,6 @@ static int ctdb_reply_control_data_pull(uint8_t *buf, size_t buflen,
                                          &cd->data.ban_state, &np);
                break;
 
-       case CTDB_CONTROL_GET_DB_PRIORITY:
-               break;
-
        case CTDB_CONTROL_GET_DB_SEQNUM:
                ret = ctdb_uint64_pull(buf, buflen, &cd->data.seqnum, &np);
                break;
@@ -1724,9 +1667,6 @@ static int ctdb_reply_control_data_pull(uint8_t *buf, size_t buflen,
                                                &cd->data.stats_list, &np);
                break;
 
-       case CTDB_CONTROL_CHECK_SRVIDS:
-               break;
-
        case CTDB_CONTROL_GET_DB_STATISTICS:
                ret = ctdb_db_statistics_pull(buf, buflen, mem_ctx,
                                              &cd->data.dbstats, &np);