X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Flock.c;h=326d38e70713443f86aa45e821b20e883d3df44a;hp=473a9bf52c3b0b855d892cf1c1b611dede6c3547;hb=4f14d7bbd5afcda4fd0f1f70e8c9aae2a929c4d4;hpb=41391dd9a73e1aa8bb8193cf6335542c703f20e9

diff --git a/ccan/tdb/lock.c b/ccan/tdb/lock.c
index 473a9bf5..326d38e7 100644
--- a/ccan/tdb/lock.c
+++ b/ccan/tdb/lock.c
@@ -301,16 +301,21 @@ int tdb_unlock(struct tdb_context *tdb, int list, int ltype)
  */
 int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
 {
-	if (tdb->have_transaction_lock || tdb->global_lock.count) {
+	if (tdb->global_lock.count) {
+		return 0;
+	}
+	if (tdb->transaction_lock_count > 0) {
+		tdb->transaction_lock_count++;
 		return 0;
 	}
+
 	if (tdb->methods->tdb_brlock(tdb, TRANSACTION_LOCK, ltype, 
 				     F_SETLKW, 0, 1) == -1) {
 		TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_lock: failed to get transaction lock\n"));
 		tdb->ecode = TDB_ERR_LOCK;
 		return -1;
 	}
-	tdb->have_transaction_lock = 1;
+	tdb->transaction_lock_count++;
 	return 0;
 }
 
@@ -320,12 +325,16 @@ int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
 int tdb_transaction_unlock(struct tdb_context *tdb)
 {
 	int ret;
-	if (!tdb->have_transaction_lock) {
+	if (tdb->global_lock.count) {
+		return 0;
+	}
+	if (tdb->transaction_lock_count > 1) {
+		tdb->transaction_lock_count--;
 		return 0;
 	}
 	ret = tdb->methods->tdb_brlock(tdb, TRANSACTION_LOCK, F_UNLCK, F_SETLKW, 0, 1);
 	if (ret == 0) {
-		tdb->have_transaction_lock = 0;
+		tdb->transaction_lock_count = 0;
 	}
 	return ret;
 }
@@ -504,7 +513,7 @@ int tdb_chainlock_unmark(struct tdb_context *tdb, TDB_DATA key)
 
 int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key)
 {
-	tdb_trace_1rec(tdb, "tdb_chainlock", key);
+	tdb_trace_1rec(tdb, "tdb_chainunlock", key);
 	return tdb_unlock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK);
 }