From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 21 Jul 2016 03:16:53 +0000 (+1000)
Subject: ctdb-freeze: Drop function thaw_priority()
X-Git-Tag: tdb-1.3.10~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5944a9bbcb17f345c56bd0dd170abf6dda03c83a;p=thirdparty%2Fsamba.git

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 27cb637068a..ec53ac5b63f 100644
--- 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;