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: rename tdb_release_extra_locks() to tdb_release_transaction_locks()

Browse Source 
tdb_release_extra_locks() is too general: it carefully skips over the
transaction lock, even though the only caller then drops it.  Change
this, and rename it to show it's clearly transaction-specific.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

(Imported from commit a84222bbaf)

(This used to be ctdb commit 803035716338170896fee15f15b17c32e7ee777e)
This commit is contained in:
Rusty Russell 2010-04-22 13:54:05 +09:30
parent 80376a7993
commit fa782ab992
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -719,11 +719,10 @@ bool tdb_have_extra_locks(struct tdb_context *tdb)
return extra;
}
/* The transaction code uses this to remove all locks. Note that this
may include OPEN_LOCK. */
void tdb_release_extra_locks(struct tdb_context *tdb)
/* The transaction code uses this to remove all locks. */
void tdb_release_transaction_locks(struct tdb_context *tdb)
{
unsigned int i, extra = 0;
unsigned int i, active = 0;
if (tdb->allrecord_lock.count != 0) {
tdb_brunlock(tdb, tdb->allrecord_lock.ltype, FREELIST_TOP, 0);
@ -733,16 +732,14 @@ void tdb_release_extra_locks(struct tdb_context *tdb)
for (i=0;i<tdb->num_lockrecs;i++) {
struct tdb_lock_type *lck = &tdb->lockrecs[i];
/* Don't release transaction or active locks! */
if (tdb->transaction && lck->off == TRANSACTION_LOCK) {
tdb->lockrecs[extra++] = *lck;
} else if (lck->off == ACTIVE_LOCK) {
tdb->lockrecs[extra++] = *lck;
/* Don't release the active lock! Copy it to first entry. */
if (lck->off == ACTIVE_LOCK) {
tdb->lockrecs[active++] = *lck;
} else {
tdb_brunlock(tdb, lck->ltype, lck->off, 1);
}
}
tdb->num_lockrecs = extra;
tdb->num_lockrecs = active;
if (tdb->num_lockrecs == 0) {
SAFE_FREE(tdb->lockrecs);
}

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

@ -233,7 +233,7 @@ int tdb_brlock(struct tdb_context *tdb,
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);
void tdb_release_extra_locks(struct tdb_context *tdb);
void tdb_release_transaction_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_allrecord_lock(struct tdb_context *tdb, int ltype,

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

@ -615,12 +615,11 @@ static int _tdb_transaction_cancel(struct tdb_context *tdb)
}
/* This also removes the OPEN_LOCK, if we have it. */
tdb_release_extra_locks(tdb);
tdb_release_transaction_locks(tdb);
/* restore the normal io methods */
tdb->methods = tdb->transaction->io_methods;
tdb_transaction_unlock(tdb, F_WRLCK);
SAFE_FREE(tdb->transaction->hash_heads);
SAFE_FREE(tdb->transaction);