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

diff --git a/ccan/tdb/transaction.c b/ccan/tdb/transaction.c
index 3d34ac84..04e4bbcd 100644
--- a/ccan/tdb/transaction.c
+++ b/ccan/tdb/transaction.c
@@ -564,7 +564,7 @@ int tdb_transaction_start(struct tdb_context *tdb)
 		return 0;
 	}
 
-	if (tdb->num_locks != 0 || tdb->allrecord_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->allrecord_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);