diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-17 12:34:26 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-17 12:34:26 +1030 |
| commit | fba42f1fb4f81b8913cce5a23ca5350ba45f40e1 (patch) | |
| tree | ede1d6f29fcb7af17af8b9010ef9247a9e397321 /lib/tdb/common/transaction.c | |
| parent | b754f61d235bdc3e410b60014d6be4072645e16f (diff) | |
| download | samba-fba42f1fb4f81b8913cce5a23ca5350ba45f40e1.tar.gz samba-fba42f1fb4f81b8913cce5a23ca5350ba45f40e1.tar.bz2 samba-fba42f1fb4f81b8913cce5a23ca5350ba45f40e1.zip | |
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 <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb/common/transaction.c')
| -rw-r--r-- | lib/tdb/common/transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |