From fba42f1fb4f81b8913cce5a23ca5350ba45f40e1 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 17 Feb 2010 12:34:26 +1030 Subject: tdb: cleanup: tdb_have_extra_locks() helper In many places we check whether locks are held: add a helper to do this. The _tdb_lockall() case has already checked for the allrecord lock, so the extra work done by tdb_have_extra_locks() is merely redundant. Signed-off-by: Rusty Russell --- lib/tdb/common/lock.c | 15 +++++++++++++-- lib/tdb/common/open.c | 2 +- lib/tdb/common/tdb_private.h | 1 + lib/tdb/common/transaction.c | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c index 66cfcbdeea..4f8970fd34 100644 --- a/lib/tdb/common/lock.c +++ b/lib/tdb/common/lock.c @@ -474,8 +474,8 @@ static int _tdb_lockall(struct tdb_context *tdb, int ltype, tdb->ecode = TDB_ERR_LOCK; return -1; } - - if (tdb->num_locks != 0) { + + if (tdb_have_extra_locks(tdb)) { /* can't combine global and chain locks */ tdb->ecode = TDB_ERR_LOCK; return -1; @@ -691,3 +691,14 @@ int tdb_unlock_record(struct tdb_context *tdb, tdb_off_t off) count++; return (count == 1 ? tdb->methods->brunlock(tdb, F_RDLCK, off, 1) : 0); } + +bool tdb_have_extra_locks(struct tdb_context *tdb) +{ + if (tdb->allrecord_lock.count) { + return true; + } + if (tdb->num_lockrecs) { + return true; + } + return false; +} diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c index 9fbd5fdea9..3fc9833863 100644 --- a/lib/tdb/common/open.c +++ b/lib/tdb/common/open.c @@ -465,7 +465,7 @@ static int tdb_reopen_internal(struct tdb_context *tdb, bool active_lock) return 0; /* Nothing to do. */ } - if (tdb->num_locks != 0 || tdb->allrecord_lock.count) { + if (tdb_have_extra_locks(tdb)) { TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_reopen: reopen not allowed with locks held\n")); goto fail; } diff --git a/lib/tdb/common/tdb_private.h b/lib/tdb/common/tdb_private.h index 4e4816bd4a..1af975de6e 100644 --- a/lib/tdb/common/tdb_private.h +++ b/lib/tdb/common/tdb_private.h @@ -234,6 +234,7 @@ int tdb_brlock(struct tdb_context *tdb, enum tdb_lock_flags flags); int tdb_brunlock(struct tdb_context *tdb, int rw_type, tdb_off_t offset, size_t len); +bool tdb_have_extra_locks(struct tdb_context *tdb); int tdb_transaction_lock(struct tdb_context *tdb, int ltype); int tdb_transaction_unlock(struct tdb_context *tdb, int ltype); int tdb_brlock_upgrade(struct tdb_context *tdb, tdb_off_t offset, size_t len); diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index 374c597d8d..36b5c035b7 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->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 */ @@ -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->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); -- cgit