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/lock.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/lock.c')
-rw-r--r-- | lib/tdb/common/lock.c | 15 |
1 files changed, 13 insertions, 2 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; +} |