X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb%2Ftransaction.c;h=81103ed8a019bf441a7b85353c23db61c7489744;hb=bc1c29d566924ebb7a303dfeb732a5303a59a9b3;hp=04e4bbcd2e574820cf2edbde0e0c2233a2952960;hpb=d92b8a7d9a050eb9735e48a8d37a5833500242d3;p=ccan

diff --git a/ccan/tdb/transaction.c b/ccan/tdb/transaction.c
index 04e4bbcd..81103ed8 100644
--- a/ccan/tdb/transaction.c
+++ b/ccan/tdb/transaction.c
@@ -509,23 +509,7 @@ 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;