tdb2: rename tdb_lock_type to tdb_lock

[ccan] / ccan / tdb2 / private.h

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 9ae5bed2e6bc6cb8c397d32d1f7f6f6ef8574930..d1f12b5531ff6843a8f94bd8182cd7156709e765 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -300,7 +300,7 @@ enum tdb_lock_flags {
        TDB_LOCK_NOCHECK = 4,
 };
 
-struct tdb_lock_type {
+struct tdb_lock {
        uint32_t off;
        uint32_t count;
        uint32_t ltype;
@@ -319,13 +319,19 @@ struct tdb_file {
        /* Single list of all TDBs, to detect multiple opens. */
        struct tdb_file *next;
 
-       /* The file descriptor. */
+       /* Mmap (if any), or malloc (for TDB_INTERNAL). */
+       void *map_ptr;
+
+       /* How much space has been mapped (<= current file size) */
+       tdb_len_t map_size;
+
+       /* The file descriptor (-1 for TDB_INTERNAL). */
        int fd;
 
        /* Lock information */
-       struct tdb_lock_type allrecord_lock;
+       struct tdb_lock allrecord_lock;
        size_t num_lockrecs;
-       struct tdb_lock_type *lockrecs;
+       struct tdb_lock *lockrecs;
 
        /* Identity of this file. */
        dev_t device;
@@ -336,15 +342,9 @@ struct tdb_context {
        /* Filename of the database. */
        const char *name;
 
-       /* Mmap (if any), or malloc (for TDB_INTERNAL). */
-       void *map_ptr;
-
        /* Are we accessing directly? (debugging check). */
        int direct_access;
 
-       /* How much space has been mapped (<= current file size) */
-       tdb_len_t map_size;
-
        /* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
        bool read_only;
 
@@ -474,7 +474,7 @@ void tdb_io_init(struct tdb_context *tdb);
 void *tdb_convert(const struct tdb_context *tdb, void *buf, tdb_len_t size);
 
 /* Unmap and try to map the tdb. */
-void tdb_munmap(struct tdb_context *tdb);
+void tdb_munmap(struct tdb_file *file);
 void tdb_mmap(struct tdb_context *tdb);
 
 /* Either alloc a copy, or give direct access.  Release frees or noop. */