From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 22 Feb 2010 03:57:13 +0000 (+1030)
Subject: tdb: cleanup: always grab allrecord lock to infinity.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=bbf2f9cef4bdbb3841869e9b87f234886985f7e8

tdb: cleanup: always grab allrecord lock to infinity.

We were previously inconsistent with our "global" lock: the
transaction code grabbed it from FREELIST_TOP to end of file, and the
rest of the code grabbed it from FREELIST_TOP to end of the hash
chains.  Change it to always grab to end of file for simplicity.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/ccan/tdb/lock.c b/ccan/tdb/lock.c
index 73d34417..b1153b2e 100644
--- a/ccan/tdb/lock.c
+++ b/ccan/tdb/lock.c
@@ -449,9 +449,7 @@ static int _tdb_lockall(struct tdb_context *tdb, int ltype,
 		return -1;
 	}
 
-	if (tdb->methods->brlock(tdb, ltype,
-				 FREELIST_TOP, 4*tdb->header.hash_size,
-				 flags)) {
+	if (tdb->methods->brlock(tdb, ltype, FREELIST_TOP, 0, flags)) {
 		if (flags & TDB_LOCK_WAIT) {
 			TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_lockall failed (%s)\n", strerror(errno)));
 		}
@@ -486,8 +484,7 @@ static int _tdb_unlockall(struct tdb_context *tdb, int ltype, bool mark_lock)
 	}
 
 	if (!mark_lock &&
-	    tdb->methods->brunlock(tdb, ltype,
-				   FREELIST_TOP, 4*tdb->header.hash_size)) {
+	    tdb->methods->brunlock(tdb, ltype, FREELIST_TOP, 0)) {
 		TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_unlockall failed (%s)\n", strerror(errno)));
 		return -1;
 	}
@@ -688,8 +685,7 @@ void tdb_release_extra_locks(struct tdb_context *tdb)
 	unsigned int i, extra = 0;
 
 	if (tdb->allrecord_lock.count != 0) {
-		tdb_brunlock(tdb, tdb->allrecord_lock.ltype,
-			     FREELIST_TOP, 4*tdb->header.hash_size);
+		tdb_brunlock(tdb, tdb->allrecord_lock.ltype, FREELIST_TOP, 0);
 		tdb->allrecord_lock.count = 0;
 	}