X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Flock.c;h=19b92d9ae09c63152b87d10062b1363a8c063516;hp=6f5799a8198f13dd06851aae03869c635035200e;hb=a879e3e2859e17496f29e14b8f393583b2c93f19;hpb=e9989ef0758b3b660abf444d014c5b51a3a7c1b4

diff --git a/ccan/tdb/lock.c b/ccan/tdb/lock.c
index 6f5799a8..19b92d9a 100644
--- a/ccan/tdb/lock.c
+++ b/ccan/tdb/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;i<tdb->num_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);
 		}