X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftraverse.c;h=1ca88d71b6326a6cf1a7f67170d030800c26a0c6;hp=8d808206f96b6fc3dcf1ee70a7d7f4687f5282a3;hb=85a33135890965218010b79c89e4d3f4905727e3;hpb=67aef98e2e4409b69ba668a2a4a9f0757ddc7ca7

diff --git a/ccan/tdb/traverse.c b/ccan/tdb/traverse.c
index 8d808206..1ca88d71 100644
--- a/ccan/tdb/traverse.c
+++ b/ccan/tdb/traverse.c
@@ -140,9 +140,9 @@ static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock
    if fn is NULL then it is not called
    a non-zero return value from fn() indicates that the traversal should stop
   */
-static int tdb_traverse_internal(struct tdb_context *tdb, 
-				 tdb_traverse_func fn, void *private_data,
-				 struct tdb_traverse_lock *tl)
+static int _tdb_traverse(struct tdb_context *tdb, 
+			 tdb_traverse_func fn, void *private_data,
+			 struct tdb_traverse_lock *tl)
 {
 	TDB_DATA key, dbuf;
 	struct list_struct rec;
@@ -226,10 +226,10 @@ int tdb_traverse_read(struct tdb_context *tdb,
 
 	tdb->traverse_read++;
 	tdb_trace(tdb, "tdb_traverse_read_start");
-	ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
+	ret = _tdb_traverse(tdb, fn, private_data, &tl);
 	tdb->traverse_read--;
 
-	tdb_transaction_unlock(tdb);
+	tdb_transaction_unlock(tdb, F_RDLCK);
 
 	return ret;
 }
@@ -257,10 +257,10 @@ int tdb_traverse(struct tdb_context *tdb,
 
 	tdb->traverse_write++;
 	tdb_trace(tdb, "tdb_traverse_start");
-	ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
+	ret = _tdb_traverse(tdb, fn, private_data, &tl);
 	tdb->traverse_write--;
 
-	tdb_transaction_unlock(tdb);
+	tdb_transaction_unlock(tdb, F_WRLCK);
 
 	return ret;
 }