ctdb-protocol: Drop marshalling code for THAW control

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

diff --git a/ctdb/protocol/protocol_api.h b/ctdb/protocol/protocol_api.h
index 055de444f15dfac8c0bb1608c36b39daa8e286c7..9e53ccf92377096351c67f662bc0dfa7667fbfe8 100644 (file)
--- a/ctdb/protocol/protocol_api.h
+++ b/ctdb/protocol/protocol_api.h
@@ -286,10 +286,6 @@ void ctdb_req_control_freeze(struct ctdb_req_control *request,
                             uint32_t priority);
 int ctdb_reply_control_freeze(struct ctdb_reply_control *reply);
 
-void ctdb_req_control_thaw(struct ctdb_req_control *request,
-                          uint32_t priority);
-int ctdb_reply_control_thaw(struct ctdb_reply_control *reply);
-
 void ctdb_req_control_get_pnn(struct ctdb_req_control *request);
 int ctdb_reply_control_get_pnn(struct ctdb_reply_control *reply,
                               uint32_t *pnn);

diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c
index e148b772b0249cdd39d7862f43d2ec1fd60f598f..f480ad047dceacb08fe1fc734ba29611c9176bce 100644 (file)
--- a/ctdb/protocol/protocol_client.c
+++ b/ctdb/protocol/protocol_client.c
@@ -673,25 +673,6 @@ int ctdb_reply_control_freeze(struct ctdb_reply_control *reply)
        return ctdb_reply_control_generic(reply, CTDB_CONTROL_FREEZE);
 }
 
-/* CTDB_CONTROL_THAW */
-
-void ctdb_req_control_thaw(struct ctdb_req_control *request,
-                          uint32_t priority)
-{
-       request->opcode = CTDB_CONTROL_THAW;
-       request->pad = 0;
-       request->srvid = priority;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_THAW;
-}
-
-int ctdb_reply_control_thaw(struct ctdb_reply_control *reply)
-{
-       return ctdb_reply_control_generic(reply, CTDB_CONTROL_THAW);
-}
-
 /* CTDB_CONTROL_GET_PNN */
 
 void ctdb_req_control_get_pnn(struct ctdb_req_control *request)

diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c
index dff3f2be9ec472302c3faaea1a385ae72ccb1a54..4a8d03bb4e665f1345eb18f7dc32159e187b8aaf 100644 (file)
--- a/ctdb/protocol/protocol_control.c
+++ b/ctdb/protocol/protocol_control.c
@@ -158,9 +158,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
        case CTDB_CONTROL_FREEZE:
                break;
 
-       case CTDB_CONTROL_THAW:
-               break;
-
        case CTDB_CONTROL_GET_PNN:
                break;
 
@@ -1245,9 +1242,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
        case CTDB_CONTROL_FREEZE:
                break;
 
-       case CTDB_CONTROL_THAW:
-               break;
-
        case CTDB_CONTROL_GET_PNN:
                break;
 

diff --git a/ctdb/tests/src/protocol_client_test.c b/ctdb/tests/src/protocol_client_test.c
index 591395ae1a135faa01e9ff9ca810f3d314192863..b8f386f0a660a1220f30d70b56bd99de415a0182 100644 (file)
--- a/ctdb/tests/src/protocol_client_test.c
+++ b/ctdb/tests/src/protocol_client_test.c
@@ -252,9 +252,6 @@ static void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_FREEZE:
                break;
 
-       case CTDB_CONTROL_THAW:
-               break;
-
        case CTDB_CONTROL_GET_PNN:
                break;
 
@@ -750,9 +747,6 @@ static void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
        case CTDB_CONTROL_FREEZE:
                break;
 
-       case CTDB_CONTROL_THAW:
-               break;
-
        case CTDB_CONTROL_GET_PNN:
                break;
 
@@ -1213,9 +1207,6 @@ static void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_FREEZE:
                break;
 
-       case CTDB_CONTROL_THAW:
-               break;
-
        case CTDB_CONTROL_GET_PNN:
                break;
 
@@ -1616,9 +1607,6 @@ static void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
        case CTDB_CONTROL_FREEZE:
                break;
 
-       case CTDB_CONTROL_THAW:
-               break;
-
        case CTDB_CONTROL_GET_PNN:
                break;