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

diff --git a/ccan/tdb/lock.c b/ccan/tdb/lock.c
index 6f5799a8..73d34417 100644
--- a/ccan/tdb/lock.c
+++ b/ccan/tdb/lock.c
@@ -277,12 +277,10 @@ int tdb_nest_lock(struct tdb_context *tdb, uint32_t offset, int ltype,
 		return -1;
 	}
 
-	tdb->num_locks++;
-
 	tdb->lockrecs[tdb->num_lockrecs].off = offset;
 	tdb->lockrecs[tdb->num_lockrecs].count = 1;
 	tdb->lockrecs[tdb->num_lockrecs].ltype = ltype;
-	tdb->num_lockrecs += 1;
+	tdb->num_lockrecs++;
 
 	return 0;
 }
@@ -368,17 +366,12 @@ int tdb_nest_unlock(struct tdb_context *tdb, uint32_t offset, int ltype,
 	} else {
 		ret = tdb->methods->brunlock(tdb, ltype, offset, 1);
 	}
-	tdb->num_locks--;
 
 	/*
 	 * Shrink the array by overwriting the element just unlocked with the
 	 * last array element.
 	 */
-
-	if (tdb->num_lockrecs > 1) {
-		*lck = tdb->lockrecs[tdb->num_lockrecs-1];
-	}
-	tdb->num_lockrecs -= 1;
+	*lck = tdb->lockrecs[--tdb->num_lockrecs];
 
 	/*
 	 * We don't bother with realloc when the array shrinks, but if we have
@@ -675,6 +668,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,13 +696,15 @@ 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);
 		}
 	}
-	tdb->num_locks = extra;
 	tdb->num_lockrecs = extra;
 	if (tdb->num_lockrecs == 0) {
 		SAFE_FREE(tdb->lockrecs);