diff options
| -rw-r--r-- | lib/tdb/common/lock.c | 17 | ||||
| -rw-r--r-- | lib/tdb/common/tdb_private.h | 2 | ||||
| -rw-r--r-- | lib/tdb/common/transaction.c | 3 |
3 files changed, 9 insertions, 13 deletions
diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c index 2a681efc99..193d1d8a0a 100644 --- a/lib/tdb/common/lock.c +++ b/lib/tdb/common/lock.c @@ -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); } diff --git a/lib/tdb/common/tdb_private.h b/lib/tdb/common/tdb_private.h index 013c2f022e..b031ddd324 100644 --- a/lib/tdb/common/tdb_private.h +++ b/lib/tdb/common/tdb_private.h @@ -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, diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index 0f9f80c86e..d24256d2fb 100644 --- a/lib/tdb/common/transaction.c +++ b/lib/tdb/common/transaction.c @@ -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); |