Browse Source

tdb: don't suppress the transaction lock because of the allrecord lock.

tdb_transaction_lock() and tdb_transaction_unlock() do nothing if we
hold the allrecord lock.  However, the two locks don't overlap, so
this is wrong.

This simplification makes the transaction lock a straight-forward nested
lock.

There are two callers for these functions:
1) The transaction code, which already makes sure the allrecord_lock
   isn't held.
2) The traverse code, which wants to stop transactions whether it has the
   allrecord lock or not.  There have been deadlocks here before, however
   this should not bring them back (I hope!)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell 16 years ago
parent
commit
57c618f35d
1 changed files with 0 additions and 6 deletions
  1. 0 6
      ccan/tdb/lock.c

+ 0 - 6
ccan/tdb/lock.c

@@ -420,9 +420,6 @@ int tdb_unlock(struct tdb_context *tdb, int list, int ltype)
  */
 int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
 {
-	if (tdb->allrecord_lock.count) {
-		return 0;
-	}
 	if (tdb->transaction_lock_count > 0) {
 		tdb->transaction_lock_count++;
 		return 0;
@@ -443,9 +440,6 @@ int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
 int tdb_transaction_unlock(struct tdb_context *tdb, int ltype)
 {
 	int ret;
-	if (tdb->allrecord_lock.count) {
-		return 0;
-	}
 	if (tdb->transaction_lock_count > 1) {
 		tdb->transaction_lock_count--;
 		return 0;