sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

locking: Use database iterator for locking databases

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

(This used to be ctdb commit d2634d72d9ca0ceeb72cbb1adc95017a234480fd)
This commit is contained in:
Amitay Isaacs 2013-04-30 14:08:51 +10:00
parent bd6ad3f817
commit 403b1eaa6e
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ctdb/server/ctdb_lock.c
View File

@ -180,43 +180,7 @@ static int db_lock_handler(struct ctdb_db_context *ctdb_db, uint32_t priority,
int ctdb_lockall_prio(struct ctdb_context *ctdb, uint32_t priority)
{
struct ctdb_db_context *ctdb_db;
for (ctdb_db = ctdb->db_list; ctdb_db; ctdb_db = ctdb_db->next) {
if (ctdb_db->priority != priority) {
continue;
}
if (later_db(ctdb, ctdb_db->db_name)) {
continue;
}
DEBUG(DEBUG_INFO, ("locking database %s, priority:%u\n",
ctdb_db->db_name, priority));
if (tdb_lockall(ctdb_db->ltdb->tdb) != 0) {
DEBUG(DEBUG_ERR, ("Failed to lock database %s\n",
ctdb_db->db_name));
return -1;
}
}
/* If priority != 1, later_db check is not required and can return */
if (priority != 1) {
return 0;
}
for (ctdb_db = ctdb->db_list; ctdb_db; ctdb_db = ctdb_db->next) {
if (!later_db(ctdb, ctdb_db->db_name)) {
continue;
}
DEBUG(DEBUG_INFO, ("locking database %s, priority:%u\n",
ctdb_db->db_name, priority));
if (tdb_lockall(ctdb_db->ltdb->tdb) != 0) {
DEBUG(DEBUG_ERR, ("Failed to lock database %s\n",
ctdb_db->db_name));
return -1;
}
}
return 0;
return ctdb_db_iterator(ctdb, priority, db_lock_handler, NULL);
}
static int ctdb_lockall(struct ctdb_context *ctdb)
@ -224,7 +188,7 @@ static int ctdb_lockall(struct ctdb_context *ctdb)
uint32_t priority;
for (priority=1; priority<=NUM_DB_PRIORITIES; priority++) {
if (ctdb_lockall_prio(ctdb, priority) != 0) {
if (ctdb_db_iterator(ctdb, priority, db_lock_handler, NULL) != 0) {
return -1;
}
}