summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2010-02-24 10:41:15 +1030
committerRusty Russell <rusty@rustcorp.com.au>2010-02-24 10:41:15 +1030
commitdb270734d8b4208e00ce9de5af1af7ee11823f6d (patch)
tree80e33210bf98ca431456682a016632d93b7bc71b
parentfba42f1fb4f81b8913cce5a23ca5350ba45f40e1 (diff)
downloadsamba-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>
-rw-r--r--lib/tdb/common/lock.c20
-rw-r--r--lib/tdb/common/tdb_private.h1
-rw-r--r--lib/tdb/common/transaction.c18
3 files changed, 22 insertions, 17 deletions
diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c
index 4f8970fd34..3013b06af6 100644
--- a/lib/tdb/common/lock.c
+++ b/lib/tdb/common/lock.c
@@ -702,3 +702,23 @@ bool tdb_have_extra_locks(struct tdb_context *tdb)
}
return false;
}
+
+/* The transaction code uses this to remove all locks. */
+void tdb_release_extra_locks(struct tdb_context *tdb)
+{
+ unsigned int i;
+
+ 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;
+ }
+
+ 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);
+}
diff --git a/lib/tdb/common/tdb_private.h b/lib/tdb/common/tdb_private.h
index 1af975de6e..32c05210ba 100644
--- a/lib/tdb/common/tdb_private.h
+++ b/lib/tdb/common/tdb_private.h
@@ -235,6 +235,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);
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);
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;