tdb2: rearrange tdb_context layout so tdb1_context can match

[ccan] / ccan / tdb2 / private.h

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 3397e04c4c4391d43bbab3e401e5a3bd0de57acf..8d961e82c365c6b0f6956fbf1019451c285597f5 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -77,10 +77,10 @@ typedef int tdb_bool_err;
 
 /* Prevent others from opening the file. */
 #define TDB_OPEN_LOCK 0
-/* Doing a transaction. */
-#define TDB_TRANSACTION_LOCK 1
 /* Expanding file. */
 #define TDB_EXPANSION_LOCK 2
+/* Doing a transaction. */
+#define TDB_TRANSACTION_LOCK 8
 /* Hash chain locks. */
 #define TDB_HASH_LOCK_START 64
 
@@ -298,9 +298,6 @@ struct tdb_access_hdr {
 };
 
 struct tdb_file {
-       /* Single list of all TDBs, to detect multiple opens. */
-       struct tdb_file *next;
-
        /* How many are sharing us? */
        unsigned int refcnt;
 
@@ -325,38 +322,42 @@ struct tdb_file {
 };
 
 struct tdb_context {
+       /* Single list of all TDBs, to detect multiple opens. */
+       struct tdb_context *next;
+
        /* Filename of the database. */
        const char *name;
 
-       /* Are we accessing directly? (debugging check). */
-       int direct_access;
-
-       /* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
-       bool read_only;
-
-       /* mmap read only? */
-       int mmap_flags;
-
-       /* the flags passed to tdb_open, for tdb_reopen. */
-       uint32_t flags;
-
        /* Logging function */
        void (*log_fn)(struct tdb_context *tdb,
                       enum tdb_log_level level,
+                      enum TDB_ERROR ecode,
                       const char *message,
                       void *data);
        void *log_data;
 
-       /* Hash function. */
-       uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
-       void *hash_data;
-       uint64_t hash_seed;
+       /* Open flags passed to tdb_open. */
+       int open_flags;
 
        /* low level (fnctl) lock functions. */
        int (*lock_fn)(int fd, int rw, off_t off, off_t len, bool w, void *);
        int (*unlock_fn)(int fd, int rw, off_t off, off_t len, void *);
        void *lock_data;
 
+       /* the flags passed to tdb_open. */
+       uint32_t flags;
+
+       /* Our statistics. */
+       struct tdb_attribute_stats stats;
+
+       /* Are we accessing directly? (debugging check). */
+       int direct_access;
+
+       /* Hash function. */
+       uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
+       void *hash_data;
+       uint64_t hash_seed;
+
        /* Set if we are in a transaction. */
        struct tdb_transaction *transaction;
        
@@ -364,12 +365,13 @@ struct tdb_context {
        tdb_off_t ftable_off;
        unsigned int ftable;
 
+       /* Our open hook, if any. */
+       enum TDB_ERROR (*openhook)(int fd, void *data);
+       void *openhook_data;
+
        /* IO methods: changes for transactions. */
        const struct tdb_methods *methods;
 
-       /* Our statistics. */
-       struct tdb_attribute_stats stats;
-
        /* Direct access information */
        struct tdb_access_hdr *access;