ctdb-freeze: Drop function thaw_priority()

There are no database priorities anymore, so the function name does
not make any sense.  Call the code in thaw_priority() directly from
ctdb_control_thaw().

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

diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c
index 27cb637068afa1004cc96e5dbb2577e1ffb607a3..ec53ac5b63f7b7b33ce99deb567ab6e93aa95cd0 100644 (file)
--- a/ctdb/server/ctdb_freeze.c
+++ b/ctdb/server/ctdb_freeze.c
@@ -605,21 +605,6 @@ bool ctdb_blocking_freeze(struct ctdb_context *ctdb)
        return true;
 }
 
-
-static void thaw_priority(struct ctdb_context *ctdb)
-{
-       DEBUG(DEBUG_ERR,("Thawing all\n"));
-
-       /* cancel any pending transactions */
-       if (ctdb->freeze_transaction_started) {
-               ctdb_db_iterator(ctdb, db_transaction_cancel_handler, NULL);
-               ctdb->freeze_transaction_started = false;
-       }
-
-       ctdb_db_iterator(ctdb, db_thaw, NULL);
-       TALLOC_FREE(ctdb->freeze_handle);
-}
-
 /*
   thaw the databases
  */
@@ -631,7 +616,16 @@ int32_t ctdb_control_thaw(struct ctdb_context *ctdb, bool check_recmode)
                return -1;
        }
 
-       thaw_priority(ctdb);
+       DEBUG(DEBUG_ERR,("Thawing all\n"));
+
+       /* cancel any pending transactions */
+       if (ctdb->freeze_transaction_started) {
+               ctdb_db_iterator(ctdb, db_transaction_cancel_handler, NULL);
+               ctdb->freeze_transaction_started = false;
+       }
+
+       ctdb_db_iterator(ctdb, db_thaw, NULL);
+       TALLOC_FREE(ctdb->freeze_handle);
 
        ctdb_call_resend_all(ctdb);
        return 0;