From e9114a758538d460d4f9deae5ce631bf44b1eff8 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 17 Feb 2010 12:19:47 +1030 Subject: tdb: cleanup: rename global_lock to allrecord_lock. The word global is overloaded in tdb. The global_lock inside struct tdb_context is used to indicate we hold a lock across all the chains. Rename it to allrecord_lock. Signed-off-by: Rusty Russell --- lib/tdb/common/transaction.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/tdb/common/transaction.c') diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index 08910a74a9..e72eff5b1f 100644 --- a/lib/tdb/common/transaction.c +++ b/lib/tdb/common/transaction.c @@ -463,7 +463,7 @@ int tdb_transaction_start(struct tdb_context *tdb) return 0; } - if (tdb->num_locks != 0 || tdb->global_lock.count) { + if (tdb->num_locks != 0 || tdb->allrecord_lock.count) { /* the caller must not have any locks when starting a transaction as otherwise we'll be screwed by lack of nested locks in posix */ @@ -621,10 +621,10 @@ static 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 */ @@ -950,7 +950,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->num_locks || tdb->allrecord_lock.count) { 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); -- cgit