From 4738d474c412cc59d26fcea64007e99094e8b675 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 24 Feb 2010 10:44:40 +1030 Subject: tdb: use tdb_nest_lock() for active lock. Use our newly-generic nested lock tracking for the active lock. Note that the tdb_have_extra_locks() and tdb_release_extra_locks() functions have to skip over this lock now it is tracked. Signed-off-by: Rusty Russell --- lib/tdb/common/lock.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/tdb/common/lock.c') diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c index 6f5799a819..19b92d9ae0 100644 --- a/lib/tdb/common/lock.c +++ b/lib/tdb/common/lock.c @@ -675,6 +675,11 @@ bool tdb_have_extra_locks(struct tdb_context *tdb) return true; } + /* We always hold the active lock if CLEAR_IF_FIRST. */ + if (find_nestlock(tdb, ACTIVE_LOCK)) { + extra--; + } + /* In a transaction, we expect to hold the transaction lock */ if (tdb->transaction && find_nestlock(tdb, TRANSACTION_LOCK)) { extra--; @@ -698,8 +703,11 @@ void tdb_release_extra_locks(struct tdb_context *tdb) for (i=0;inum_lockrecs;i++) { struct tdb_lock_type *lck = &tdb->lockrecs[i]; + /* Don't release transaction or active locks! */ if (tdb->transaction && lck->off == TRANSACTION_LOCK) { tdb->lockrecs[extra++] = *lck; + } else if (lck->off == ACTIVE_LOCK) { + tdb->lockrecs[extra++] = *lck; } else { tdb_brunlock(tdb, lck->ltype, lck->off, 1); } -- cgit