sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

ctdb-freeze: Drop function thaw_priority()

Browse Source 
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>
This commit is contained in:
Amitay Isaacs 2016-07-21 13:16:53 +10:00 committed by Amitay Isaacs
parent 79b6b4b621
commit 5944a9bbcb
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ctdb/server/ctdb_freeze.c
View File

@ -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;