tdb2: expand lock now nests inside other locks.

[ccan] / ccan / tdb2 / test / run-02-expand.c

diff --git a/ccan/tdb2/test/run-02-expand.c b/ccan/tdb2/test/run-02-expand.c
index b303f5b23b3e0c5871aa41ccccd133300dffd690..3ce33b9f80303ff47d58cc4e79db54d14169024c 100644 (file)
--- a/ccan/tdb2/test/run-02-expand.c
+++ b/ccan/tdb2/test/run-02-expand.c
@@ -26,33 +26,33 @@ int main(int argc, char *argv[])
 
                /* First expand. Should add a zone, doubling file size.. */
                val = tdb->map_size - 1 - sizeof(struct tdb_header);
-               ok1(tdb_expand(tdb, 1, 1, false) == 0);
+               ok1(tdb_expand(tdb, 1) == 0);
                ok1(tdb->map_size == 2 * val + 1 + sizeof(struct tdb_header));
                ok1(tdb_check(tdb, NULL, NULL) == 0);
 
                /* Second expand, add another zone of same size. */
-               ok1(tdb_expand(tdb, 1, 1, false) == 0);
+               ok1(tdb_expand(tdb, 1) == 0);
                ok1(tdb->map_size == 3 * val + 1 + sizeof(struct tdb_header));
                ok1(tdb_check(tdb, NULL, NULL) == 0);
 
                /* Large expand, but can only add 4th zone of same size. */
-               ok1(tdb_expand(tdb, 0, 4*val, false) == 0);
+               ok1(tdb_expand(tdb, 4*val) == 0);
                ok1(tdb->map_size == 4 * val + 1 + sizeof(struct tdb_header));
                ok1(tdb_check(tdb, NULL, NULL) == 0);
 
                /* Large expand now will double file. */
-               ok1(tdb_expand(tdb, 0, 4*val, false) == 0);
+               ok1(tdb_expand(tdb, 4*val) == 0);
                ok1(tdb->map_size == 8 * val + 1 + sizeof(struct tdb_header));
                ok1(tdb_check(tdb, NULL, NULL) == 0);
 
                /* And again? */
-               ok1(tdb_expand(tdb, 0, 4*val, false) == 0);
+               ok1(tdb_expand(tdb, 4*val) == 0);
                ok1(tdb->map_size == 16 * val + 1 + sizeof(struct tdb_header));
                ok1(tdb_check(tdb, NULL, NULL) == 0);
 
                /* Below comfort level, will add a single 8*val zone. */
-               ok1(tdb_expand(tdb, 0, ((8*val) >> TDB_COMFORT_FACTOR_BITS)
-                              - sizeof(struct tdb_used_record), false) == 0);
+               ok1(tdb_expand(tdb, ((8*val) >> TDB_COMFORT_FACTOR_BITS)
+                              - sizeof(struct tdb_used_record)) == 0);
                ok1(tdb->map_size == 24 * val + 1 + sizeof(struct tdb_header));
                tdb_close(tdb);
        }