sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

tdb: cleanup: tdb_have_extra_locks() helper

Browse Source 
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>

(Imported from commit fba42f1fb4)

(This used to be ctdb commit dda3587dfee598f387c2e696f3645486fac65052)
This commit is contained in:
Rusty Russell 2010-04-22 13:53:51 +09:30
parent 5f40176e88
commit 4ceb70ee37
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ctdb/lib/tdb/common/lock.c
View File

@ -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;
}

2
ctdb/lib/tdb/common/open.c
View File

@ -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;
}

1
ctdb/lib/tdb/common/tdb_private.h
View File

@ -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);

4
ctdb/lib/tdb/common/transaction.c
View File

@ -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);