X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftransaction.c;h=04e4bbcd2e574820cf2edbde0e0c2233a2952960;hp=ad07ad9fed1006dc41714c440395881ddc7465a3;hb=d92b8a7d9a050eb9735e48a8d37a5833500242d3;hpb=05f69a4723f3a48502a699805c90c16489bf0525

diff --git a/ccan/tdb/transaction.c b/ccan/tdb/transaction.c
index ad07ad9f..04e4bbcd 100644
--- a/ccan/tdb/transaction.c
+++ b/ccan/tdb/transaction.c
@@ -510,17 +510,17 @@ int _tdb_transaction_cancel(struct tdb_context *tdb, int ltype)
 	}
 
 	/* remove any global lock created during the transaction */
-	if (tdb->global_lock.count != 0) {
-		tdb_brunlock(tdb, tdb->global_lock.ltype,
+	if (tdb->allrecord_lock.count != 0) {
+		tdb_brunlock(tdb, tdb->allrecord_lock.ltype,
 			     FREELIST_TOP, 4*tdb->header.hash_size);
-		tdb->global_lock.count = 0;
+		tdb->allrecord_lock.count = 0;
 	}
 
 	/* remove any locks created during the transaction */
 	if (tdb->num_locks != 0) {
 		for (i=0;i<tdb->num_lockrecs;i++) {
 			tdb_brunlock(tdb, tdb->lockrecs[i].ltype,
-				     FREELIST_TOP+4*tdb->lockrecs[i].list, 1);
+				     tdb->lockrecs[i].off, 1);
 		}
 		tdb->num_locks = 0;
 		tdb->num_lockrecs = 0;
@@ -564,7 +564,7 @@ int tdb_transaction_start(struct tdb_context *tdb)
 		return 0;
 	}
 
-	if (tdb->num_locks != 0 || tdb->global_lock.count) {
+	if (tdb_have_extra_locks(tdb)) {
 		/* the caller must not have any locks when starting a
 		   transaction as otherwise we'll be screwed by lack
 		   of nested locks in posix */
@@ -944,7 +944,7 @@ static int _tdb_transaction_prepare_commit(struct tdb_context *tdb)
 	
 	/* if there are any locks pending then the caller has not
 	   nested their locks properly, so fail the transaction */
-	if (tdb->num_locks || tdb->global_lock.count) {
+	if (tdb_have_extra_locks(tdb)) {
 		tdb->ecode = TDB_ERR_LOCK;
 		TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: locks pending on commit\n"));
 		_tdb_transaction_cancel(tdb, F_RDLCK);