diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-24 10:41:15 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-24 10:41:15 +1030 |
| commit | db270734d8b4208e00ce9de5af1af7ee11823f6d (patch) | |
| tree | 80e33210bf98ca431456682a016632d93b7bc71b /lib/tdb/common/transaction.c | |
| parent | fba42f1fb4f81b8913cce5a23ca5350ba45f40e1 (diff) | |
| download | samba-db270734d8b4208e00ce9de5af1af7ee11823f6d.tar.gz samba-db270734d8b4208e00ce9de5af1af7ee11823f6d.tar.bz2 samba-db270734d8b4208e00ce9de5af1af7ee11823f6d.zip | |
tdb: cleanup: tdb_release_extra_locks() helper
Move locking intelligence back into lock.c, rather than open-coding the
lock release in transaction.c.
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 | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index 36b5c035b7..02ef72a357 100644 --- a/lib/tdb/common/transaction.c +++ b/lib/tdb/common/transaction.c @@ -620,23 +620,7 @@ static int _tdb_transaction_cancel(struct tdb_context *tdb, int ltype) tdb->transaction->open_lock_taken = false; } - /* remove any global lock created during the transaction */ - if (tdb->allrecord_lock.count != 0) { - tdb_brunlock(tdb, tdb->allrecord_lock.ltype, - FREELIST_TOP, 4*tdb->header.hash_size); - tdb->allrecord_lock.count = 0; - } - - /* remove any locks created during the transaction */ - if (tdb->num_locks != 0) { - for (i=0;i<tdb->num_lockrecs;i++) { - tdb_brunlock(tdb, tdb->lockrecs[i].ltype, - tdb->lockrecs[i].off, 1); - } - tdb->num_locks = 0; - tdb->num_lockrecs = 0; - SAFE_FREE(tdb->lockrecs); - } + tdb_release_extra_locks(tdb); /* restore the normal io methods */ tdb->methods = tdb->transaction->io_methods; |