X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Flock.c;h=3013b06af6ec855477b0991422a2948bf7b69359;hp=e3759a3f8dddd38465fa4da4fdaea992cecb264c;hb=c730c0d2899ec0d6a84088e2146fb14760793c38;hpb=acf1a21e440b2908df0ce57c48dab1aca9e23cad

diff --git a/ccan/tdb/lock.c b/ccan/tdb/lock.c
index e3759a3f..3013b06a 100644
--- a/ccan/tdb/lock.c
+++ b/ccan/tdb/lock.c
@@ -420,9 +420,6 @@ int tdb_unlock(struct tdb_context *tdb, int list, int ltype)
  */
 int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
 {
-	if (tdb->allrecord_lock.count) {
-		return 0;
-	}
 	if (tdb->transaction_lock_count > 0) {
 		tdb->transaction_lock_count++;
 		return 0;
@@ -443,9 +440,6 @@ int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
 int tdb_transaction_unlock(struct tdb_context *tdb, int ltype)
 {
 	int ret;
-	if (tdb->allrecord_lock.count) {
-		return 0;
-	}
 	if (tdb->transaction_lock_count > 1) {
 		tdb->transaction_lock_count--;
 		return 0;
@@ -480,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;
@@ -697,3 +691,34 @@ 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;
+}
+
+/* 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);
+}